From 4bfbaa8c26853f54f794ffb8fed0dee3bbd6bae0 Mon Sep 17 00:00:00 2001 From: scottsanderson Date: Fri, 10 Aug 2012 01:18:55 -0400 Subject: [PATCH] minor protocol change --- zipline/gens/transform.py | 3 ++- zipline/protocol.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zipline/gens/transform.py b/zipline/gens/transform.py index babf4e3d..60d0be85 100644 --- a/zipline/gens/transform.py +++ b/zipline/gens/transform.py @@ -105,7 +105,8 @@ class StatefulTransform(object): # FORWARDER flag means we want to keep all original # values, plus append tnfm_id and tnfm_value. Used for # preserving the original event fields when our output - # will be fed into a merge. + # will be fed into a merge. Currently only Passthrough + # uses this flag. if self.forward_all: out_message = message_copy out_message.tnfm_id = self.namestring diff --git a/zipline/protocol.py b/zipline/protocol.py index fce16403..19ee8c80 100644 --- a/zipline/protocol.py +++ b/zipline/protocol.py @@ -658,7 +658,7 @@ def tuple_to_date(date_tuple): # message with its type. DATASOURCE_TYPE = Enum( 'AS_TRADED_EQUITY', - 'MERGE', + 'MERGER', 'SPLIT', 'DIVIDEND', 'TRADE',