Skip to content

Commit

Permalink
Report wrongly-typed settings and abort, as originally planned.
Browse files Browse the repository at this point in the history
Thanks Claude for the heads up. Refs #12493 and commit 5e08b79.
  • Loading branch information
ramiro committed Jun 29, 2013
1 parent 5e3a653 commit 64cdea6
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions django/conf/__init__.py
Expand Up @@ -132,9 +132,17 @@ def __init__(self, settings_module):
% (self.SETTINGS_MODULE, e) % (self.SETTINGS_MODULE, e)
) )


tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")

for setting in dir(mod): for setting in dir(mod):
if setting == setting.upper(): if setting == setting.upper():
setting_value = getattr(mod, setting) setting_value = getattr(mod, setting)

if setting in tuple_settings and \
isinstance(setting_value, six.string_types):
raise ImproperlyConfigured("The %s setting must be a tuple. "
"Please fix your settings." % setting)

setattr(self, setting, setting_value) setattr(self, setting, setting_value)


if not self.SECRET_KEY: if not self.SECRET_KEY:
Expand Down

0 comments on commit 64cdea6

Please sign in to comment.