From d47144dfb823b0e0aa00bb563d1c4cd2a41c89b1 Mon Sep 17 00:00:00 2001 From: Scott Sanderson Date: Wed, 28 Sep 2016 19:17:01 -0400 Subject: [PATCH] DOC: Rename NoopRestrictions to NoRestrictions. --- tests/finance/test_slippage.py | 4 ++-- tests/test_finance.py | 4 ++-- tests/test_history.py | 4 ++-- tests/test_restrictions.py | 4 ++-- tests/test_tradesimulation.py | 4 ++-- zipline/algorithm.py | 4 ++-- zipline/finance/restrictions.py | 2 +- zipline/testing/fixtures.py | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/finance/test_slippage.py b/tests/finance/test_slippage.py index 17846b94..48d33b95 100644 --- a/tests/finance/test_slippage.py +++ b/tests/finance/test_slippage.py @@ -29,7 +29,7 @@ from zipline.finance.slippage import VolumeShareSlippage from zipline.protocol import DATASOURCE_TYPE, BarData from zipline.finance.blotter import Order -from zipline.finance.restrictions import NoopRestrictions +from zipline.finance.restrictions import NoRestrictions from zipline.data.data_portal import DataPortal from zipline.testing import tmp_bcolz_equity_minute_bar_reader from zipline.testing.fixtures import ( @@ -788,7 +788,7 @@ class OrdersStopTestCase(WithSimParams, lambda: dt, self.sim_params.data_frequency, self.trading_calendar, - NoopRestrictions(), + NoRestrictions(), ) _, txn = next(slippage_model.simulate( diff --git a/tests/test_finance.py b/tests/test_finance.py index b8729933..488d52c7 100644 --- a/tests/test_finance.py +++ b/tests/test_finance.py @@ -37,7 +37,7 @@ from zipline.data.minute_bars import BcolzMinuteBarReader from zipline.data.data_portal import DataPortal from zipline.data.us_equity_pricing import BcolzDailyBarWriter from zipline.finance.slippage import FixedSlippage -from zipline.finance.restrictions import NoopRestrictions +from zipline.finance.restrictions import NoRestrictions from zipline.protocol import BarData from zipline.testing import ( tmp_trading_env, @@ -322,7 +322,7 @@ class FinanceTestCase(WithLogger, simulation_dt_func=lambda: tick, data_frequency=sim_params.data_frequency, trading_calendar=self.trading_calendar, - restrictions=NoopRestrictions(), + restrictions=NoRestrictions(), ) txns, _, closed_orders = blotter.get_transactions(bar_data) for txn in txns: diff --git a/tests/test_history.py b/tests/test_history.py index 2859bb8b..d1ae15eb 100644 --- a/tests/test_history.py +++ b/tests/test_history.py @@ -28,7 +28,7 @@ from zipline.errors import ( HistoryWindowStartsBeforeData, ) from zipline.finance.trading import SimulationParameters -from zipline.finance.restrictions import NoopRestrictions +from zipline.finance.restrictions import NoRestrictions from zipline.testing import ( create_minute_df_for_asset, str_to_seconds, @@ -806,7 +806,7 @@ class MinuteEquityHistoryTestCase(WithHistory, ZiplineTestCase): data_portal=data_portal, simulation_dt_func=lambda: minutes[15], data_frequency='minute', - restrictions=NoopRestrictions(), + restrictions=NoRestrictions(), trading_calendar=self.trading_calendar, ) diff --git a/tests/test_restrictions.py b/tests/test_restrictions.py index 078b9699..aa6d50cb 100644 --- a/tests/test_restrictions.py +++ b/tests/test_restrictions.py @@ -11,7 +11,7 @@ from zipline.finance.restrictions import ( HistoricalRestrictions, StaticRestrictions, SecurityListRestrictions, - NoopRestrictions, + NoRestrictions, ) from zipline.testing import parameter_space @@ -273,7 +273,7 @@ class RestrictionsTestCase(WithDataPortal, ZiplineTestCase): Test single- and multi-asset queries on no-op restrictions """ - rl = NoopRestrictions() + rl = NoRestrictions() assert_not_restricted = partial(self.assert_not_restricted, rl) assert_all_restrictions = partial(self.assert_all_restrictions, rl) diff --git a/tests/test_tradesimulation.py b/tests/test_tradesimulation.py index c6027004..428d409b 100644 --- a/tests/test_tradesimulation.py +++ b/tests/test_tradesimulation.py @@ -24,7 +24,7 @@ from zipline import TradingAlgorithm from zipline.gens.sim_engine import BEFORE_TRADING_START_BAR from zipline.finance.performance import PerformanceTracker -from zipline.finance.restrictions import NoopRestrictions +from zipline.finance.restrictions import NoRestrictions from zipline.gens.tradesimulation import AlgorithmSimulator from zipline.sources.benchmark_source import BenchmarkSource from zipline.test_algorithms import NoopAlgorithm @@ -136,7 +136,7 @@ def initialize(context): self.data_portal, BeforeTradingStartsOnlyClock(dt), algo._create_benchmark_source(), - NoopRestrictions(), + NoRestrictions(), None ) diff --git a/zipline/algorithm.py b/zipline/algorithm.py index 55f06cf9..9e2e579c 100644 --- a/zipline/algorithm.py +++ b/zipline/algorithm.py @@ -83,7 +83,7 @@ from zipline.finance.slippage import ( ) from zipline.finance.cancel_policy import NeverCancel, CancelPolicy from zipline.finance.restrictions import ( - NoopRestrictions, + NoRestrictions, StaticRestrictions, SecurityListRestrictions, ) @@ -425,7 +425,7 @@ class TradingAlgorithm(object): # A dictionary of the actual capital change deltas, keyed by timestamp self.capital_change_deltas = {} - self.restrictions = NoopRestrictions() + self.restrictions = NoRestrictions() def init_engine(self, get_loader): """ diff --git a/zipline/finance/restrictions.py b/zipline/finance/restrictions.py index 52d3b150..463eb916 100644 --- a/zipline/finance/restrictions.py +++ b/zipline/finance/restrictions.py @@ -48,7 +48,7 @@ class Restrictions(with_metaclass(abc.ABCMeta)): raise NotImplementedError('is_restricted') -class NoopRestrictions(Restrictions): +class NoRestrictions(Restrictions): """ A no-op restrictions that contains no restrictions """ diff --git a/zipline/testing/fixtures.py b/zipline/testing/fixtures.py index 8290b5a4..eb6bd0f9 100644 --- a/zipline/testing/fixtures.py +++ b/zipline/testing/fixtures.py @@ -36,7 +36,7 @@ from ..utils.classproperty import classproperty from ..utils.final import FinalMeta, final from .core import tmp_asset_finder, make_simple_equity_info from zipline.assets import Equity, Future -from zipline.finance.restrictions import NoopRestrictions +from zipline.finance.restrictions import NoRestrictions from zipline.pipeline import SimplePipelineEngine from zipline.pipeline.loaders.testing import make_seeded_random_loader from zipline.protocol import BarData @@ -1333,5 +1333,5 @@ class WithCreateBarData(WithDataPortal): simulation_dt_func, self.CREATE_BARDATA_DATA_FREQUENCY, self.trading_calendar, - restrictions or NoopRestrictions() + restrictions or NoRestrictions() )