Commit 080dd74e authored by inondle's avatar inondle Committed by Tim Graham
Browse files

Fixed #26616 -- Improved error message when AppConfig.name is invalid.

parent 77982966

django/apps/config.py

+8 −1
Original line number Diff line number Diff line
@@ -139,7 +139,14 @@ class AppConfig(object): 
                "'%s' must supply a name attribute." % entry)



        # Ensure app_name points to a valid module.

        try:

            app_module = import_module(app_name)

        except ImportError:

            raise ImproperlyConfigured(

                "Cannot import '%s'. Check that '%s.%s.name' is correct." % (

                    app_name, mod_path, cls_name,

                )

            )



        # Entry is a path to an app config class.

        return cls(app_name, app_module)

tests/apps/tests.py

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ class AppsTests(SimpleTestCase): 
        with self.assertRaises(ImportError):

            with self.settings(INSTALLED_APPS=['there is no such app']):

                pass

        with self.assertRaises(ImportError):

        msg = "Cannot import 'there is no such app'. Check that 'apps.apps.NoSuchApp.name' is correct."

        with self.assertRaisesMessage(ImproperlyConfigured, msg):

            with self.settings(INSTALLED_APPS=['apps.apps.NoSuchApp']):

                pass