From ee08d38ab66aa3a0e9cacf46d3fc1add0c7a0683 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Fri, 6 Nov 2009 16:56:17 -0200 Subject: [PATCH] removed deprecated SCRAPYSETTINGS_MODULE environment variable --- scrapy/conf/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scrapy/conf/__init__.py b/scrapy/conf/__init__.py index bf1840181..9dd9e0536 100644 --- a/scrapy/conf/__init__.py +++ b/scrapy/conf/__init__.py @@ -6,14 +6,9 @@ See documentation in docs/topics/settings.rst import os import cPickle as pickle -import warnings from scrapy.conf import default_settings -if 'SCRAPYSETTINGS_MODULE' in os.environ: - warnings.warn("SCRAPYSETTINGS_MODULE environment variable is deprecated, " \ - "use SCRAPY_SETTINGS_MODULE instead", DeprecationWarning, stacklevel=2) - import_ = lambda x: __import__(x, {}, {}, ['']) class Settings(object): @@ -23,7 +18,7 @@ class Settings(object): self.global_defaults = default_settings self.disabled = os.environ.get('SCRAPY_SETTINGS_DISABLED', False) settings_module_path = os.environ.get('SCRAPY_SETTINGS_MODULE', \ - os.environ.get('SCRAPYSETTINGS_MODULE', 'scrapy_settings')) + 'scrapy_settings') self.set_settings_module(settings_module_path) # XXX: find a better solution for this hack