From 799a357d98561acfab8a01c2211c45d1973395f2 Mon Sep 17 00:00:00 2001 From: Eddie Hebert Date: Sun, 6 Jan 2013 17:13:07 -0500 Subject: [PATCH] Changes test factory to use Event instead of ndict. As more sources are moving off of ndict, changing the factory to use Event, so that when testing we are exercising use of Event. --- zipline/protocol.py | 3 +++ zipline/utils/factory.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zipline/protocol.py b/zipline/protocol.py index 52c7ecc2..99d33d39 100644 --- a/zipline/protocol.py +++ b/zipline/protocol.py @@ -50,5 +50,8 @@ class Event(object): def __eq__(self, other): return self.__dict__ == other.__dict__ + def __contains__(self, name): + return name in self.__dict__ + def __repr__(self): return "Event({0})".format(self.__dict__) diff --git a/zipline/utils/factory.py b/zipline/utils/factory.py index c518d483..9ed25835 100644 --- a/zipline/utils/factory.py +++ b/zipline/utils/factory.py @@ -30,7 +30,7 @@ from datetime import datetime, timedelta import zipline.finance.risk as risk from zipline.utils.date_utils import tuple_to_date -from zipline.utils.protocol_utils import ndict +from zipline.protocol import Event from zipline.sources import (SpecificEquityTrades, DataFrameSource, DataPanelSource) @@ -144,7 +144,7 @@ def create_trade_history(sid, prices, amounts, interval, trading_calendar, def create_txn(sid, price, amount, datetime): - txn = ndict({ + txn = Event({ 'sid': sid, 'amount': amount, 'dt': datetime,