Merge pull request #1586 from quantopian/fix-continuous-future-daily-…

…get-value BUG: Fix bad attribute lookup on session continuous future reader.
quantopian · Nov 8, 2016 · fa6e4fe · fa6e4fe
2 parents b5d4df6 + 512e62b
commit fa6e4fe
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/tests/test_continuous_futures.py b/tests/test_continuous_futures.py
@@ -222,7 +222,7 @@ def test_current_contract(self):
                          'Auto close at beginning of session so FOG16 is now '
                          'the current contract.')
 
-    def test_get_spot_value_contract_daily(self):
+    def test_get_value_contract_daily(self):
         cf_primary = self.asset_finder.create_continuous_future(
             'FO', 0, 'calendar')
 
@@ -246,6 +246,30 @@ def test_get_spot_value_contract_daily(self):
                          'Auto close at beginning of session so FOG16 is now '
                          'the current contract.')
 
+    def test_get_value_close_daily(self):
+        cf_primary = self.asset_finder.create_continuous_future(
+            'FO', 0, 'calendar')
+
+        value = self.data_portal.get_spot_value(
+            cf_primary,
+            'close',
+            pd.Timestamp('2016-01-26', tz='UTC'),
+            'daily',
+        )
+
+        self.assertEqual(value, 105011.44)
+
+        value = self.data_portal.get_spot_value(
+            cf_primary,
+            'close',
+            pd.Timestamp('2016-01-27', tz='UTC'),
+            'daily',
+        )
+
+        self.assertEqual(value, 115021.44,
+                         'Auto close at beginning of session so FOG16 is now '
+                         'the current contract.')
+
     def test_current_contract_volume_roll(self):
         cf_primary = self.asset_finder.create_continuous_future(
             'FO', 0, 'volume')

diff --git a/zipline/data/continuous_future_reader.py b/zipline/data/continuous_future_reader.py
@@ -135,7 +135,7 @@ def get_value(self, continuous_future, dt, field):
             If the given dt is not a valid market minute (in minute mode) or
             session (in daily mode) according to this reader's tradingcalendar.
         """
-        rf = self._roll_finders[continuous_future.roll]
+        rf = self._roll_finders[continuous_future.roll_style]
         sid = (rf.get_contract_center(continuous_future.root_symbol,
                                       dt,
                                       continuous_future.offset))

diff --git a/zipline/data/resample.py b/zipline/data/resample.py
@@ -541,7 +541,7 @@ def get_value(self, sid, session, colname):
         # This was developed to complete interface, but has not been tuned
         # for real world use.
         start, end = self._calendar.open_and_close_for_session(session)
-        return self._get_resampled([colname], start, end, [sid])[0]
+        return self._get_resampled([colname], start, end, [sid])[0][0][0]
 
     @lazyval
     def sessions(self):