From f6902f0368e8ebae5b1c1c3d73d3191ba9b72885 Mon Sep 17 00:00:00 2001
From: Jean Bredeche <jean@quantopian.com>
Date: Mon, 11 Apr 2016 13:39:51 -0400
Subject: [PATCH] BUG: bar_data.history too limiting on iterable types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In before_trading_start, history needs to call
DataPortal.get_adjustments, and that method wasn’t correctly checking
for iterables.
---
 tests/test_history.py       | 17 +++++++++++++++++
 zipline/data/data_portal.py |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/test_history.py b/tests/test_history.py
index fa2bd787..b205e34a 100644
--- a/tests/test_history.py
+++ b/tests/test_history.py
@@ -859,6 +859,23 @@ class MinuteEquityHistoryTestCase(HistoryTestCaseBase):
         # last 5 minutes should not be adjusted
         np.testing.assert_array_equal(np.array(range(782, 787)), window3[395:])
 
+    def test_passing_iterable_to_history_regular_hours(self):
+        # regular hours
+        current_dt = pd.Timestamp("2015-01-06 9:45", tz='US/Eastern')
+        bar_data = BarData(self.data_portal, lambda: current_dt, "minute")
+
+        bar_data.history(pd.Index([self.ASSET1, self.ASSET2]),
+                         "high", 5, "1m")
+
+    def test_passing_iterable_to_history_bts(self):
+        # before market hours
+        current_dt = pd.Timestamp("2015-01-07 8:45", tz='US/Eastern')
+        bar_data = BarData(self.data_portal, lambda: current_dt, "minute")
+
+        with handle_non_market_minutes(bar_data):
+            bar_data.history(pd.Index([self.ASSET1, self.ASSET2]),
+                             "high", 5, "1m")
+
     def test_overnight_adjustments(self):
         # Should incorporate adjustments on midnight 01/06
         current_dt = pd.Timestamp("2015-01-06 8:45", tz='US/Eastern')
diff --git a/zipline/data/data_portal.py b/zipline/data/data_portal.py
index 7fff4ac2..9db60e5c 100644
--- a/zipline/data/data_portal.py
+++ b/zipline/data/data_portal.py
@@ -785,7 +785,7 @@ class DataPortal(object):
         -------
         The list of adjustments for the asset(s)
         """
-        if not isinstance(assets, (list, tuple)):
+        if isinstance(assets, Asset):
             assets = [assets]
 
         adjustment_ratios_per_asset = []