diff --git a/scrapy/conf/default_settings.py b/scrapy/conf/default_settings.py index 59947f79f..6402c76f5 100644 --- a/scrapy/conf/default_settings.py +++ b/scrapy/conf/default_settings.py @@ -126,8 +126,6 @@ MAIL_FROM = 'scrapy@localhost' MEMDEBUG_ENABLED = False # enable memory debugging MEMDEBUG_NOTIFY = [] # send memory debugging report by mail at engine shutdown -MEMORYSTORE = 'scrapy.core.scheduler.MemoryStore' - MEMUSAGE_ENABLED = 1 MEMUSAGE_LIMIT_MB = 0 MEMUSAGE_NOTIFY_MAIL = [] diff --git a/scrapy/core/scheduler/store.py b/scrapy/contrib_exp/history/memorystore.py similarity index 100% rename from scrapy/core/scheduler/store.py rename to scrapy/contrib_exp/history/memorystore.py diff --git a/scrapy/contrib_exp/history/middleware.py b/scrapy/contrib_exp/history/middleware.py index 4baf3767f..b1771e96b 100644 --- a/scrapy/contrib_exp/history/middleware.py +++ b/scrapy/contrib_exp/history/middleware.py @@ -15,8 +15,10 @@ class HistoryMiddleware(object): # How often we should process pages that have not changed (need to include depth) MIN_PROCESS_UNCHANGED_DAYS = 12 + MEMORYSTORE = 'scrapy.contrib_exp.history.memorystore.MemoryStore' + def __init__(self): - historycls = load_object(settings['MEMORYSTORE']) + historycls = load_object(self.MEMORYSTORE) if not historycls: raise NotConfigured self.historydata = historycls() diff --git a/scrapy/contrib_exp/history/store.py b/scrapy/contrib_exp/history/sqlstore.py similarity index 100% rename from scrapy/contrib_exp/history/store.py rename to scrapy/contrib_exp/history/sqlstore.py diff --git a/scrapy/core/scheduler/__init__.py b/scrapy/core/scheduler/__init__.py index 51f8ecab5..5f28c6bf3 100644 --- a/scrapy/core/scheduler/__init__.py +++ b/scrapy/core/scheduler/__init__.py @@ -1,3 +1,2 @@ from scrapy.core.scheduler.schedulers import Scheduler -from scrapy.core.scheduler.store import MemoryStore from scrapy.core.scheduler.middleware import SchedulerMiddlewareManager