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

Revert "Fixed #12288 -- Validated that app names in INSTALLED_APPS are unique" 

This reverts commit c1ec08998d.

There are backwards compatability concerns with this.
This commit is contained in:
Tim Graham 2013-09-14 07:19:32 -04:00
parent 74b91b3888
commit 886bb9d878
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/conf/__init__.py
View File

@ -109,9 +109,8 @@ class BaseSettings(object):
"to a tuple, not a string.")
elif name == "INSTALLED_APPS":
value = list(value) # force evaluation of generators on Python 3
apps = [s.split('.')[-1] for s in value]
if len(value) != len(set(apps)):
raise ImproperlyConfigured("The INSTALLED_APPS setting must contain unique app names.")
if len(value) != len(set(value)):
raise ImproperlyConfigured("The INSTALLED_APPS setting must contain unique values.")
object.__setattr__(self, name, value)

5
tests/settings_tests/tests.py
View File

@ -241,14 +241,11 @@ class UniqueSettingsTests(TestCase):
def test_unique(self):
"""
An ImproperlyConfigured exception is raised if the INSTALLED_APPS contains
any duplicate appication names.
any duplicate strings.
"""
with self.assertRaises(ImproperlyConfigured):
self.settings_module.INSTALLED_APPS = ("myApp1", "myApp1", "myApp2", "myApp3")
with self.assertRaises(ImproperlyConfigured):
self.settings_module.INSTALLED_APPS = ("package1.myApp1", "package2.myApp1")
class TrailingSlashURLTests(TestCase):
"""