From bcf81cd3c40c9d756a48e9398fb6388f8d0ea623 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Mon, 31 Aug 2009 07:36:09 -0300 Subject: [PATCH] minor simplification to how default settings are loaded --- scrapy/conf/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scrapy/conf/__init__.py b/scrapy/conf/__init__.py index 782c19792..140a800ba 100644 --- a/scrapy/conf/__init__.py +++ b/scrapy/conf/__init__.py @@ -7,15 +7,15 @@ See documentation in docs/topics/settings.rst import os import cPickle as pickle +from scrapy.conf import default_settings + import_ = lambda x: __import__(x, {}, {}, ['']) class Settings(object): - default_settings_module = 'scrapy.conf.default_settings' - def __init__(self): self.defaults = {} - self.global_defaults = import_(self.default_settings_module) + 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'))