RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed SCRAPYSETTINGS_MODULE to SCRAPY_SETTINGS_MODULE

This commit is contained in:
Ismael Carnales 2009-08-28 11:20:05 -03:00
parent 0bfa1a910c
commit 3616ccb479
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/googledir/scrapy-ctl.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
import os
os.environ.setdefault('SCRAPYSETTINGS_MODULE', 'googledir.settings')
os.environ.setdefault('SCRAPY_SETTINGS_MODULE', 'googledir.settings')
from scrapy.command.cmdline import execute
execute()

4
scrapy/conf/__init__.py
View File

@ -17,8 +17,8 @@ class Settings(object):
self.defaults = {}
self.global_defaults = import_(self.default_settings_module)
self.disabled = os.environ.get('SCRAPY_SETTINGS_DISABLED', False)
settings_module_path = os.environ.get('SCRAPYSETTINGS_MODULE', \
'scrapy_settings')
settings_module_path = os.environ.get('SCRAPY_SETTINGS_MODULE', \
os.environ.get('SCRAPYSETTINGS_MODULE', 'scrapy_settings'))
self.set_settings_module(settings_module_path)
# XXX: find a better solution for this hack

2
scrapy/templates/project/root/scrapy-ctl.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
import os
os.environ.setdefault('SCRAPYSETTINGS_MODULE', '${project_name}.settings')
os.environ.setdefault('SCRAPY_SETTINGS_MODULE', '${project_name}.settings')
from scrapy.command.cmdline import execute
execute()