Scrapy, a fast high-level web crawling & scraping framework for Python.
Obsolete deprecated settings
nyov1b591ff061f2
diff --git a/scrapy/core/scheduler.py b/scrapy/core/scheduler.pyindex e184ed50e..c96b9b719 100644--- a/scrapy/core/scheduler.py+++ b/scrapy/core/scheduler.py@@ -66,8 +66,7 @@ class Scheduler(object):dqclass = load_object(settings['SCHEDULER_DISK_QUEUE'])mqclass = load_object(settings['SCHEDULER_MEMORY_QUEUE'])- logunser = settings.getbool('LOG_UNSERIALIZABLE_REQUESTS',- settings.getbool('SCHEDULER_DEBUG'))+ logunser = settings.getbool('SCHEDULER_DEBUG')return cls(dupefilter, jobdir=job_dir(settings), logunser=logunser,stats=crawler.stats, pqclass=pqclass, dqclass=dqclass,mqclass=mqclass, crawler=crawler)diff --git a/scrapy/downloadermiddlewares/redirect.py b/scrapy/downloadermiddlewares/redirect.pyindex 77cb5aa94..08cff8a55 100644--- a/scrapy/downloadermiddlewares/redirect.py+++ b/scrapy/downloadermiddlewares/redirect.py@@ -93,8 +93,7 @@ class MetaRefreshMiddleware(BaseRedirectMiddleware):def __init__(self, settings):super(MetaRefreshMiddleware, self).__init__(settings)self._ignore_tags = settings.getlist('METAREFRESH_IGNORE_TAGS')- self._maxdelay = settings.getint('REDIRECT_MAX_METAREFRESH_DELAY',- settings.getint('METAREFRESH_MAXDELAY'))+ self._maxdelay = settings.getint('METAREFRESH_MAXDELAY')def process_response(self, request, response, spider):if request.meta.get('dont_redirect', False) or request.method == 'HEAD' or \diff --git a/scrapy/settings/deprecated.py b/scrapy/settings/deprecated.pyindex 1211908df..f6f878725 100644--- a/scrapy/settings/deprecated.py+++ b/scrapy/settings/deprecated.py@@ -11,8 +11,6 @@ DEPRECATED_SETTINGS = [('SQLITE_DB', 'no longer supported'),('AUTOTHROTTLE_MIN_DOWNLOAD_DELAY', 'use DOWNLOAD_DELAY instead'),('AUTOTHROTTLE_MAX_CONCURRENCY', 'use CONCURRENT_REQUESTS_PER_DOMAIN instead'),- ('REDIRECT_MAX_METAREFRESH_DELAY', 'use METAREFRESH_MAXDELAY instead'),- ('LOG_UNSERIALIZABLE_REQUESTS', 'use SCHEDULER_DEBUG instead'),]diff --git a/tests/test_scheduler.py b/tests/test_scheduler.pyindex e0e3600e5..13c297084 100644--- a/tests/test_scheduler.py+++ b/tests/test_scheduler.py@@ -46,7 +46,7 @@ class MockCrawler(Crawler):def __init__(self, priority_queue_cls, jobdir):settings = dict(- LOG_UNSERIALIZABLE_REQUESTS=False,+ SCHEDULER_DEBUG=False,SCHEDULER_DISK_QUEUE='scrapy.squeues.PickleLifoDiskQueue',SCHEDULER_MEMORY_QUEUE='scrapy.squeues.LifoMemoryQueue',SCHEDULER_PRIORITY_QUEUE=priority_queue_cls,