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

Simplied some code in django.conf.__init__.

This commit is contained in:
Ondrej Sika 2013-12-18 18:13:40 +01:00 committed by Tim Graham
parent a39d672ec7
commit 4ac5def4a2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/conf/__init__.py
View File

@ -34,11 +34,8 @@ class LazySettings(LazyObject):
is used the first time we need any settings at all, if the user has not is used the first time we need any settings at all, if the user has not
previously configured the settings manually. previously configured the settings manually.
""" """
try: settings_module = os.environ.get(ENVIRONMENT_VARIABLE)
settings_module = os.environ[ENVIRONMENT_VARIABLE] if not settings_module:
if not settings_module: # If it's set but is an empty string.
raise KeyError
except KeyError:
desc = ("setting %s" % name) if name else "settings" desc = ("setting %s" % name) if name else "settings"
raise ImproperlyConfigured( raise ImproperlyConfigured(
"Requested %s, but settings are not configured. " "Requested %s, but settings are not configured. "