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

Fixed #22780 -- Checked that LOCALE_PATHS is really a tuple

This commit is contained in:
Tim Schaffer 2014-06-10 22:52:14 +02:00 committed by Claude Paroz
parent 868ff4e37c
commit a1c6cd6a16
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/conf/__init__.py
View File

@ -98,7 +98,7 @@ class Settings(BaseSettings):
% (self.SETTINGS_MODULE, e) % (self.SETTINGS_MODULE, e)
) )
tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS") tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS", "LOCALE_PATHS")
self._explicit_settings = set() self._explicit_settings = set()
for setting in dir(mod): for setting in dir(mod):
if setting.isupper(): if setting.isupper():

21
tests/settings_tests/tests.py
View File

@ -436,3 +436,24 @@ class IsOverriddenTest(TestCase):
self.assertFalse(settings.is_overridden('TEMPLATE_LOADERS')) self.assertFalse(settings.is_overridden('TEMPLATE_LOADERS'))
with override_settings(TEMPLATE_LOADERS=[]): with override_settings(TEMPLATE_LOADERS=[]):
self.assertTrue(settings.is_overridden('TEMPLATE_LOADERS')) self.assertTrue(settings.is_overridden('TEMPLATE_LOADERS'))
class TestTupleSettings(unittest.TestCase):
"""
Make sure settings that should be tuples throw ImproperlyConfigured if they
are set to a string instead of a tuple.
"""
tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS", "LOCALE_PATHS")
def test_tuple_settings(self):
settings_module = ModuleType('fake_settings_module')
settings_module.SECRET_KEY = 'foo'
for setting in self.tuple_settings:
setattr(settings_module, setting, ('non_tuple_value'))
sys.modules['fake_settings_module'] = settings_module
try:
with self.assertRaises(ImproperlyConfigured):
s = Settings('fake_settings_module')
finally:
del sys.modules['fake_settings_module']
delattr(settings_module, setting)