From cf063abcf15927b1490fc804706f95fbf20f8708 Mon Sep 17 00:00:00 2001 From: Jean Bredeche Date: Thu, 23 Feb 2017 11:32:04 -0500 Subject: [PATCH] Rename _attrs_to_check to asdict --- tests/finance/test_slippage.py | 3 +++ zipline/finance/slippage.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/finance/test_slippage.py b/tests/finance/test_slippage.py index 4f559332..5698080f 100644 --- a/tests/finance/test_slippage.py +++ b/tests/finance/test_slippage.py @@ -95,6 +95,9 @@ class SlippageTestCase(WithCreateBarData, self.assertEqual(vol1, vol2) self.assertEqual(hash(vol1), hash(vol2)) + self.assertEqual(vol1.__dict__, vol1.asdict()) + self.assertEqual(vol2.__dict__, vol2.asdict()) + def test_fill_price_worse_than_limit_price(self): non_limit_order = TestOrder(limit=None, direction=1) limit_buy = TestOrder(limit=1.5, direction=1) diff --git a/zipline/finance/slippage.py b/zipline/finance/slippage.py index d9e4d7a2..42036695 100644 --- a/zipline/finance/slippage.py +++ b/zipline/finance/slippage.py @@ -153,15 +153,15 @@ class SlippageModel(with_metaclass(abc.ABCMeta)): return self.simulate(bar_data, asset, current_orders) def __eq__(self, other): - return self._attrs_to_check() == other._attrs_to_check() + return self.asdict() == other.asdict() def __hash__(self): return hash(( type(self), - tuple(sorted(iteritems(self._attrs_to_check()))) + tuple(sorted(iteritems(self.asdict()))) )) - def _attrs_to_check(self): + def asdict(self): return self.__dict__