innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #88 -- settings are now forgiving of single-element INSTALLED_APPS and TEMPLATE_DIRS without trailing commas. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-19 17:58:01 +00:00
parent df66763406
commit e29afe7974
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/conf/settings.py
View File

@ -29,9 +29,16 @@ try:
except ImportError, e: except ImportError, e:
raise EnvironmentError, "Could not import DJANGO_SETTINGS_MODULE '%s' (is it on sys.path?): %s" % (me.SETTINGS_MODULE, e) raise EnvironmentError, "Could not import DJANGO_SETTINGS_MODULE '%s' (is it on sys.path?): %s" % (me.SETTINGS_MODULE, e)
# Settings that should be converted into tuples if they're mistakenly entered
# as strings.
tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")
for setting in dir(mod): for setting in dir(mod):
if setting == setting.upper(): if setting == setting.upper():
setattr(me, setting, getattr(mod, setting)) setting_value = getattr(mod, setting)
if setting in tuple_settings and type(setting_value) == str:
setting_value = (setting_value,) # In case the user forgot the comma.
setattr(me, setting, setting_value)
# save DJANGO_SETTINGS_MODULE in case anyone in the future cares # save DJANGO_SETTINGS_MODULE in case anyone in the future cares
me.SETTINGS_MODULE = os.environ.get('DJANGO_SETTINGS_MODULE', '') me.SETTINGS_MODULE = os.environ.get('DJANGO_SETTINGS_MODULE', '')