Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Fixed #12288 -- Validated that app names in INSTALLED_APPS ar…

…e unique"

This reverts commit c1ec089.

There are backwards compatability concerns with this.
  • Loading branch information...
commit 886bb9d8780303b4c8f45c55e0ac0a6b644b73af 1 parent 74b91b3
@timgraham timgraham authored
Showing with 3 additions and 7 deletions.
  1. +2 −3 django/conf/__init__.py
  2. +1 −4 tests/settings_tests/tests.py
View
5 django/conf/__init__.py
@@ -109,9 +109,8 @@ def __setattr__(self, name, value):
"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)
View
5 tests/settings_tests/tests.py
@@ -241,14 +241,11 @@ def tearDown(self):
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):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.