From 22572834fb80835d82d851bf6fa134d7ac45877b Mon Sep 17 00:00:00 2001 From: Julia Medina Date: Mon, 26 May 2014 23:27:29 -0300 Subject: [PATCH] Deprecate CrawlerSettings, as its functionality is replicable by Settings class --- scrapy/settings/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scrapy/settings/__init__.py b/scrapy/settings/__init__.py index 27ffca148..4fed21899 100644 --- a/scrapy/settings/__init__.py +++ b/scrapy/settings/__init__.py @@ -1,6 +1,8 @@ import six import json +from scrapy.utils.deprecate import create_deprecated_class + from . import default_settings @@ -103,7 +105,7 @@ class Settings(object): class CrawlerSettings(Settings): def __init__(self, settings_module=None, **kw): - super(CrawlerSettings, self).__init__(**kw) + Settings.__init__(self, **kw) self.settings_module = settings_module self.overrides = {} self.defaults = {} @@ -115,11 +117,15 @@ class CrawlerSettings(Settings): return getattr(self.settings_module, opt_name) if opt_name in self.defaults: return self.defaults[opt_name] - return super(CrawlerSettings, self).__getitem__(opt_name) + return Settings.__getitem__(self, opt_name) def __str__(self): return "" % self.settings_module +CrawlerSettings = create_deprecated_class( + 'CrawlerSettings', CrawlerSettings, + new_class_path='scrapy.settings.Settings') + def iter_default_settings(): """Return the default settings as an iterator of (name, value) tuples"""