Django

Code

Changeset 213

Show
Ignore:
Timestamp:
07/19/05 12:58:01 (3 years ago)
Author:
adrian
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/settings.py

    r203 r213  
    3030    raise EnvironmentError, "Could not import DJANGO_SETTINGS_MODULE '%s' (is it on sys.path?): %s" % (me.SETTINGS_MODULE, e) 
    3131 
     32# Settings that should be converted into tuples if they're mistakenly entered 
     33# as strings. 
     34tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS") 
     35 
    3236for setting in dir(mod): 
    3337    if setting == setting.upper(): 
    34         setattr(me, setting, getattr(mod, setting)) 
     38        setting_value = getattr(mod, setting) 
     39        if setting in tuple_settings and type(setting_value) == str: 
     40            setting_value = (setting_value,) # In case the user forgot the comma. 
     41        setattr(me, setting, setting_value) 
    3542 
    3643# save DJANGO_SETTINGS_MODULE in case anyone in the future cares