p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed an obsolete unicity check. 

It doesn't account for app configs.

Refs #21679.
This commit is contained in:
Aymeric Augustin 2013-12-31 16:22:07 +01:00
parent d0eeddd6fc
commit 553500133c
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/conf/__init__.py
View File

@ -104,11 +104,6 @@ class BaseSettings(object):
elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types): elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types):
raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set " raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set "
"to a tuple, not a string.") "to a tuple, not a string.")
elif name == "INSTALLED_APPS":
value = list(value) # force evaluation of generators on Python 3
if len(value) != len(set(value)):
raise ImproperlyConfigured("The INSTALLED_APPS setting must contain unique values.")
object.__setattr__(self, name, value) object.__setattr__(self, name, value)

21
tests/settings_tests/tests.py
View File

@ -292,27 +292,6 @@ class TestComplexSettingOverride(TestCase):
'Overriding setting TEST_WARN can lead to unexpected behaviour.') 'Overriding setting TEST_WARN can lead to unexpected behaviour.')
class UniqueSettingsTests(TestCase):
"""
Tests for the INSTALLED_APPS setting.
"""
settings_module = settings
def setUp(self):
self._installed_apps = self.settings_module.INSTALLED_APPS
def tearDown(self):
self.settings_module.INSTALLED_APPS = self._installed_apps
def test_unique(self):
"""
An ImproperlyConfigured exception is raised if the INSTALLED_APPS contains
any duplicate strings.
"""
with self.assertRaises(ImproperlyConfigured):
self.settings_module.INSTALLED_APPS = ("myApp1", "myApp1", "myApp2", "myApp3")
class TrailingSlashURLTests(TestCase): class TrailingSlashURLTests(TestCase):
""" """
Tests for the MEDIA_URL and STATIC_URL settings. Tests for the MEDIA_URL and STATIC_URL settings.