From 73faf9133e94105bd74a1f50c2aed8b12a5a33d8 Mon Sep 17 00:00:00 2001 From: Jonathan Kamens Date: Tue, 29 Oct 2013 09:39:39 -0400 Subject: [PATCH] MAINT: Clean up imports of zipline.finance.trading Use "from zipline.finance import trading" instead of "import zipline.finance.trading as trading". --- tests/test_algorithm_gen.py | 2 +- tests/test_finance.py | 2 +- tests/test_perf_tracking.py | 2 +- zipline/algorithm.py | 2 +- zipline/examples/dual_moving_average.py | 2 +- zipline/finance/performance/tracker.py | 2 +- zipline/finance/risk/cumulative.py | 2 +- zipline/finance/risk/period.py | 2 +- zipline/finance/risk/risk.py | 2 +- zipline/finance/trading.py | 2 +- zipline/gens/tradesimulation.py | 2 +- zipline/transforms/batch_transform.py | 2 +- zipline/transforms/utils.py | 2 +- zipline/utils/factory.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/test_algorithm_gen.py b/tests/test_algorithm_gen.py index 6f226822..6c526b5f 100644 --- a/tests/test_algorithm_gen.py +++ b/tests/test_algorithm_gen.py @@ -20,7 +20,7 @@ from nose.tools import timed from datetime import datetime import pytz -import zipline.finance.trading as trading +from zipline.finance import trading from zipline.algorithm import TradingAlgorithm from zipline.finance import slippage from zipline.utils import factory diff --git a/tests/test_finance.py b/tests/test_finance.py index 09b144f3..689edd77 100644 --- a/tests/test_finance.py +++ b/tests/test_finance.py @@ -37,7 +37,7 @@ import zipline.utils.simfactory as simfactory from zipline.finance.blotter import Blotter from zipline.gens.composites import date_sorted_sources -import zipline.finance.trading as trading +from zipline.finance import trading from zipline.finance.trading import SimulationParameters from zipline.finance.performance import PerformanceTracker diff --git a/tests/test_perf_tracking.py b/tests/test_perf_tracking.py index bc9eb373..35ddd468 100644 --- a/tests/test_perf_tracking.py +++ b/tests/test_perf_tracking.py @@ -32,7 +32,7 @@ import zipline.utils.math_utils as zp_math from zipline.gens.composites import date_sorted_sources from zipline.finance.trading import SimulationParameters from zipline.finance.blotter import Order -import zipline.finance.trading as trading +from zipline.finance import trading from zipline.protocol import DATASOURCE_TYPE from zipline.utils.factory import create_random_simulation_parameters import zipline.protocol diff --git a/zipline/algorithm.py b/zipline/algorithm.py index 158b83df..bc13270c 100644 --- a/zipline/algorithm.py +++ b/zipline/algorithm.py @@ -41,7 +41,7 @@ from zipline.finance.slippage import ( from zipline.finance.commission import PerShare, PerTrade from zipline.finance.blotter import Blotter from zipline.finance.constants import ANNUALIZER -import zipline.finance.trading as trading +from zipline.finance import trading import zipline.protocol from zipline.protocol import Event diff --git a/zipline/examples/dual_moving_average.py b/zipline/examples/dual_moving_average.py index 8ad234c3..3bb81ef5 100755 --- a/zipline/examples/dual_moving_average.py +++ b/zipline/examples/dual_moving_average.py @@ -17,7 +17,7 @@ import matplotlib.pyplot as plt from zipline.algorithm import TradingAlgorithm -import zipline.finance.trading as trading +from zipline.finance import trading from zipline.transforms import MovingAverage from zipline.utils.factory import load_from_yahoo diff --git a/zipline/finance/performance/tracker.py b/zipline/finance/performance/tracker.py index 95b300b0..57498bdd 100644 --- a/zipline/finance/performance/tracker.py +++ b/zipline/finance/performance/tracker.py @@ -65,7 +65,7 @@ from pandas.tseries.tools import normalize_date import zipline.protocol as zp import zipline.finance.risk as risk -import zipline.finance.trading as trading +from zipline.finance import trading from . period import PerformancePeriod log = logbook.Logger('Performance') diff --git a/zipline/finance/risk/cumulative.py b/zipline/finance/risk/cumulative.py index ad708bc0..a91841da 100644 --- a/zipline/finance/risk/cumulative.py +++ b/zipline/finance/risk/cumulative.py @@ -18,7 +18,7 @@ import logbook import math import numpy as np -import zipline.finance.trading as trading +from zipline.finance import trading import zipline.utils.math_utils as zp_math import pandas as pd diff --git a/zipline/finance/risk/period.py b/zipline/finance/risk/period.py index f07dec7a..2e7867f5 100644 --- a/zipline/finance/risk/period.py +++ b/zipline/finance/risk/period.py @@ -20,7 +20,7 @@ import math import numpy as np import numpy.linalg as la -import zipline.finance.trading as trading +from zipline.finance import trading import pandas as pd diff --git a/zipline/finance/risk/risk.py b/zipline/finance/risk/risk.py index b7b4e20b..a2c1151c 100644 --- a/zipline/finance/risk/risk.py +++ b/zipline/finance/risk/risk.py @@ -58,7 +58,7 @@ Risk Report import logbook import numpy as np -import zipline.finance.trading as trading +from zipline.finance import trading import zipline.utils.math_utils as zp_math log = logbook.Logger('Risk') diff --git a/zipline/finance/trading.py b/zipline/finance/trading.py index b0c0eb68..94c09d4e 100644 --- a/zipline/finance/trading.py +++ b/zipline/finance/trading.py @@ -44,7 +44,7 @@ log = logbook.Logger('Trading') # subsequently referenced directly by zipline financial # components. To set the environment, you can set the property on # the module directly: -# import zipline.finance.trading as trading +# from zipline.finance import trading # trading.environment = TradingEnvironment() # # or if you want to switch the environment for a limited context diff --git a/zipline/gens/tradesimulation.py b/zipline/gens/tradesimulation.py index df48ed39..6b762f62 100644 --- a/zipline/gens/tradesimulation.py +++ b/zipline/gens/tradesimulation.py @@ -14,7 +14,7 @@ # limitations under the License. from logbook import Logger, Processor -import zipline.finance.trading as trading +from zipline.finance import trading from zipline.protocol import ( BarData, SIDData, diff --git a/zipline/transforms/batch_transform.py b/zipline/transforms/batch_transform.py index 599cb4e3..5f0698ea 100644 --- a/zipline/transforms/batch_transform.py +++ b/zipline/transforms/batch_transform.py @@ -29,7 +29,7 @@ import pandas as pd from zipline.utils.data import RollingPanel from zipline.protocol import Event -import zipline.finance.trading as trading +from zipline.finance import trading from . utils import check_window_length diff --git a/zipline/transforms/utils.py b/zipline/transforms/utils.py index 113d1df3..8f6d6801 100644 --- a/zipline/transforms/utils.py +++ b/zipline/transforms/utils.py @@ -29,7 +29,7 @@ from abc import ABCMeta, abstractmethod from zipline.protocol import DATASOURCE_TYPE from zipline.gens.utils import assert_sort_unframe_protocol, hash_args -import zipline.finance.trading as trading +from zipline.finance import trading log = logbook.Logger('Transform') diff --git a/zipline/utils/factory.py b/zipline/utils/factory.py index 3f2bd07a..d2467e42 100644 --- a/zipline/utils/factory.py +++ b/zipline/utils/factory.py @@ -31,7 +31,7 @@ from zipline.sources import (SpecificEquityTrades, DataFrameSource, DataPanelSource) from zipline.finance.trading import SimulationParameters -import zipline.finance.trading as trading +from zipline.finance import trading from zipline.sources.test_source import ( date_gen, create_trade