Merge 393ae91 into 3ea5916

quantopian · Jan 10, 2020 · 4d55a8c · 4d55a8c
2 parents 3ea5916 + 393ae91
commit 4d55a8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/zipline/pipeline/loaders/equity_pricing_loader.py b/zipline/pipeline/loaders/equity_pricing_loader.py
@@ -141,8 +141,8 @@ def load_adjusted_array(self, domain, columns, dates, sids, mask):
     @property
     def currency_aware(self):
         # Tell the pipeline engine that this loader supports currency
-        # conversion.
-        return True
+        # conversion if we have a non-dummy fx rates reader.
+        return not isinstance(self.fx_reader, ExplodingFXRateReader)
 
     def _inplace_currency_convert(self, columns, arrays, dates, sids):
         """