update

ricequant · Feb 22, 2017 · b91ee6a · b91ee6a
1 parent 97b80b0
commit b91ee6a
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/rqalpha/__init__.py b/rqalpha/__init__.py
@@ -38,7 +38,7 @@
 def run(config, source_code=None):
     import locale
     import os
-    from .cache_control import set_cache_policy, CachePolicy
+    from .utils.cache_control import set_cache_policy, CachePolicy
     from .utils.i18n import localization
     from .utils.config import parse_config
     from . import main

diff --git a/rqalpha/__main__.py b/rqalpha/__main__.py
@@ -20,7 +20,7 @@
 import os
 import shutil
 
-from .cache_control import set_cache_policy, CachePolicy
+from .utils.cache_control import set_cache_policy, CachePolicy
 from .utils.click_helper import Date
 from .utils.i18n import localization
 from .utils.config import parse_config

diff --git a/rqalpha/core/default_strategy_loader.py → rqalpha/core/strategy_loader.py b/rqalpha/core/default_strategy_loader.py → rqalpha/core/strategy_loader.py
diff --git a/rqalpha/data/base_data_source.py b/rqalpha/data/base_data_source.py
@@ -23,7 +23,7 @@
 except Exception as e:
     from fastcache import lru_cache
 
-from .. import cache_control
+from ..utils import cache_control
 from ..utils.datetime_func import convert_date_to_int, convert_int_to_date
 from ..interface import AbstractDataSource
 from .converter import StockBarConverter, IndexBarConverter

diff --git a/rqalpha/data/data_proxy.py b/rqalpha/data/data_proxy.py
@@ -26,10 +26,10 @@
 from . import risk_free_helper
 from .instrument_mixin import InstrumentMixin
 from .trading_dates_mixin import TradingDatesMixin
-from .. import cache_control
 from ..model.bar import BarObject
 from ..model.snapshot import SnapshotObject
 from ..utils.datetime_func import convert_int_to_datetime
+from ..utils import cache_control
 
 
 class DataProxy(InstrumentMixin, TradingDatesMixin):

diff --git a/rqalpha/data/date_set.py b/rqalpha/data/date_set.py
@@ -22,7 +22,7 @@
 except Exception as e:
     from fastcache import lru_cache
 
-from .. import cache_control
+from ..utils import cache_control
 
 
 class DateSet(object):

diff --git a/rqalpha/data/dividend_store.py b/rqalpha/data/dividend_store.py
@@ -22,7 +22,7 @@
 except Exception as e:
     from fastcache import lru_cache
 
-from .. import cache_control
+from ..utils import cache_control
 
 
 class DividendStore(object):

diff --git a/rqalpha/data/trading_dates_mixin.py b/rqalpha/data/trading_dates_mixin.py
@@ -22,7 +22,7 @@
 except Exception as e:
     from fastcache import lru_cache
 
-from .. import cache_control
+from ..utils import cache_control
 
 
 class TradingDatesMixin(object):

diff --git a/rqalpha/main.py b/rqalpha/main.py
@@ -29,15 +29,15 @@
 
 from . import const
 from .api import helper as api_helper
-from .core.default_strategy_loader import FileStrategyLoader, SourceCodeStrategyLoader
+from .core.strategy_loader import FileStrategyLoader, SourceCodeStrategyLoader
 from .core.strategy import Strategy
 from .core.strategy_universe import StrategyUniverse
 from .core.global_var import GlobalVars
 from .core.strategy_context import StrategyContext
 from .data.base_data_source import BaseDataSource
 from .data.data_proxy import DataProxy
 from .environment import Environment
-from .events import Event, EVENT
+from .events import EVENT
 from .execution_context import ExecutionContext
 from .interface import Persistable
 from .mod.mod_handler import ModHandler

diff --git a/rqalpha/cache_control.py → rqalpha/utils/cache_control.py b/rqalpha/cache_control.py → rqalpha/utils/cache_control.py