From 4109640acbfd8afdff05d9ca627c9cdea55e10ad Mon Sep 17 00:00:00 2001
From: Scott Sanderson <scoutoss@gmail.com>
Date: Thu, 5 Nov 2015 11:57:32 -0500
Subject: [PATCH] MAINT: `make_simple_asset_info` -> `make_simple_equity_info`.

---
 tests/pipeline/base.py               | 4 ++--
 tests/pipeline/test_blaze.py         | 6 +++---
 tests/pipeline/test_engine.py        | 6 +++---
 tests/pipeline/test_pipeline_algo.py | 4 ++--
 zipline/utils/test_utils.py          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/pipeline/base.py b/tests/pipeline/base.py
index 17556087..a35fb22c 100644
--- a/tests/pipeline/base.py
+++ b/tests/pipeline/base.py
@@ -12,7 +12,7 @@ from zipline.finance.trading import TradingEnvironment
 from zipline.pipeline.engine import SimplePipelineEngine
 from zipline.pipeline.term import AssetExists
 from zipline.utils.pandas_utils import explode
-from zipline.utils.test_utils import make_simple_asset_info, ExplodingObject
+from zipline.utils.test_utils import make_simple_equity_info, ExplodingObject
 from zipline.utils.tradingcalendar import trading_day
 
 
@@ -52,7 +52,7 @@ class BasePipelineTestCase(TestCase):
         # Set up env for test
         env = TradingEnvironment()
         env.write_data(
-            equities_df=make_simple_asset_info(
+            equities_df=make_simple_equity_info(
                 assets,
                 self.__calendar[0],
                 self.__calendar[-1],
diff --git a/tests/pipeline/test_blaze.py b/tests/pipeline/test_blaze.py
index c42f4e14..3864a203 100644
--- a/tests/pipeline/test_blaze.py
+++ b/tests/pipeline/test_blaze.py
@@ -29,18 +29,18 @@ from zipline.pipeline.loaders.blaze import (
     NonPipelineField,
 )
 from zipline.utils.numpy_utils import repeat_last_axis
-from zipline.utils.test_utils import tmp_asset_finder, make_simple_asset_info
+from zipline.utils.test_utils import tmp_asset_finder, make_simple_equity_info
 
 
 nameof = op.attrgetter('name')
 dtypeof = op.attrgetter('dtype')
 asset_infos = (
-    (make_simple_asset_info(
+    (make_simple_equity_info(
         tuple(map(ord, 'ABC')),
         pd.Timestamp(0),
         pd.Timestamp('2015'),
     ),),
-    (make_simple_asset_info(
+    (make_simple_equity_info(
         tuple(map(ord, 'ABCD')),
         pd.Timestamp(0),
         pd.Timestamp('2015'),
diff --git a/tests/pipeline/test_engine.py b/tests/pipeline/test_engine.py
index ddb92e77..76b6acc2 100644
--- a/tests/pipeline/test_engine.py
+++ b/tests/pipeline/test_engine.py
@@ -51,7 +51,7 @@ from zipline.pipeline.factors import (
 from zipline.utils.memoize import lazyval
 from zipline.utils.test_utils import (
     make_rotating_asset_info,
-    make_simple_asset_info,
+    make_simple_equity_info,
     product_upper_triangle,
     check_arrays,
 )
@@ -151,7 +151,7 @@ class ConstantInputTestCase(TestCase):
             assets=self.assets,
         )
 
-        self.asset_info = make_simple_asset_info(
+        self.asset_info = make_simple_equity_info(
             self.assets,
             start_date=self.dates[0],
             end_date=self.dates[-1],
@@ -498,7 +498,7 @@ class FrameInputTestCase(TestCase):
             tz='UTC',
         )
 
-        asset_info = make_simple_asset_info(
+        asset_info = make_simple_equity_info(
             cls.assets,
             start_date=cls.dates[0],
             end_date=cls.dates[-1],
diff --git a/tests/pipeline/test_pipeline_algo.py b/tests/pipeline/test_pipeline_algo.py
index 36499cca..da749d31 100644
--- a/tests/pipeline/test_pipeline_algo.py
+++ b/tests/pipeline/test_pipeline_algo.py
@@ -57,7 +57,7 @@ from zipline.pipeline.loaders.equity_pricing_loader import (
     USEquityPricingLoader,
 )
 from zipline.utils.test_utils import (
-    make_simple_asset_info,
+    make_simple_equity_info,
     str_to_seconds,
 )
 from zipline.utils.tradingcalendar import (
@@ -332,7 +332,7 @@ class PipelineAlgorithmTestCase(TestCase):
         cls.MSFT = 2
         cls.BRK_A = 3
         cls.assets = [cls.AAPL, cls.MSFT, cls.BRK_A]
-        asset_info = make_simple_asset_info(
+        asset_info = make_simple_equity_info(
             cls.assets,
             Timestamp('2014'),
             Timestamp('2015'),
diff --git a/zipline/utils/test_utils.py b/zipline/utils/test_utils.py
index c878d687..28c5075a 100644
--- a/zipline/utils/test_utils.py
+++ b/zipline/utils/test_utils.py
@@ -281,7 +281,7 @@ def make_rotating_asset_info(num_assets,
     )
 
 
-def make_simple_asset_info(assets, start_date, end_date, symbols=None):
+def make_simple_equity_info(assets, start_date, end_date, symbols=None):
     """
     Create a DataFrame representing assets that exist for the full duration
     between `start_date` and `end_date`.
@@ -375,7 +375,7 @@ class tmp_assets_db(object):
     def __init__(self, data=None):
         self._eng = None
         self._data = AssetDBWriterFromDataFrame(
-            data if data is not None else make_simple_asset_info(
+            data if data is not None else make_simple_equity_info(
                 list(map(ord, 'ABC')),
                 pd.Timestamp(0),
                 pd.Timestamp('2015'),