From f3aba5f2817bd863dc9250eabaf8b57e2079f5df Mon Sep 17 00:00:00 2001 From: Scott Sanderson Date: Tue, 4 Apr 2017 17:12:21 -0400 Subject: [PATCH] BUG: Return from can_trade in same order as input. This matches the behavior of history and data.current. --- zipline/_protocol.pyx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zipline/_protocol.pyx b/zipline/_protocol.pyx index 2eb48f23..c440e7f6 100644 --- a/zipline/_protocol.pyx +++ b/zipline/_protocol.pyx @@ -480,12 +480,13 @@ cdef class BarData: assets, dt, adjusted_dt, data_portal ) else: - return pd.Series(data={ - asset: self._can_trade_for_asset( + tradeable = [ + self._can_trade_for_asset( asset, dt, adjusted_dt, data_portal ) for asset in assets - }) + ] + return pd.Series(data=tradeable, index=assets) cdef bool _can_trade_for_asset(self, asset, dt, adjusted_dt, data_portal): cdef object session_label