Commit 886bb9d8 authored by Tim Graham's avatar Tim Graham
Browse files

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

This reverts commit c1ec0899.

There are backwards compatability concerns with this.
parent 74b91b38

django/conf/__init__.py

+2 −3
Original line number Diff line number Diff line
@@ -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)

tests/settings_tests/tests.py

+1 −4
Original line number Diff line number Diff line
@@ -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):

    """