test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

django.conf.settings now fails loudly if DJANGO_SETTINGS_MODULE is broken in any way. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2005-07-16 16:07:04 +00:00
parent b4168db4af
commit f69ce6c2b3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
django/conf/settings.py
View File

@ -18,15 +18,20 @@ for setting in dir(global_settings):
if setting == setting.upper():
setattr(me, setting, getattr(global_settings, setting))
# try to load DJANGO_SETTINGS_MODULE
# try to load DJANGO_SETTINGS_MODULE
try:
mod = __import__(os.environ['DJANGO_SETTINGS_MODULE'], '', '', [''])
except (KeyError, ImportError, ValueError):
pass
else:
for setting in dir(mod):
if setting == setting.upper():
setattr(me, setting, getattr(mod, setting))
me.SETTINGS_MODULE = os.environ["DJANGO_SETTINGS_MODULE"]
except KeyError:
raise EnvironmentError("Environemnt variable DJANGO_SETTINGS_MODULE is undefined."
try:
mod = __import__(me.SETTINGS_MODULE, '', '', [''])
except ImportError, e:
raise EnvironmentError("Could not import DJANGO_SETTINGS_MODULE '%s' (is it on sys.path?): %s" % (me.SETTINGS_MODULE, e)
for setting in dir(mod):
if setting == setting.upper():
setattr(me, setting, getattr(mod, setting))
# save DJANGO_SETTINGS_MODULE in case anyone in the future cares
me.SETTINGS_MODULE = os.environ.get('DJANGO_SETTINGS_MODULE', '')