Commit 45829933 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Populated models only when necessary in get_app_config[s]. 

Took this opportunity to change get_app[s] to only consider applications
containing a model module as that seems slightly more backwards compatible.

Since callers that care about models pass only_with_models_module=True,
this has very few consequences. Only AppCommand needed a change.
parent f25fa9d8

django/core/apps/cache.py

+22 −12
Original line number Diff line number Diff line
@@ -144,12 +144,16 @@ class AppCache(object): 


    def get_app_configs(self, only_with_models_module=False):

        """

        Return an iterable of application configurations.

        Imports applications and returns an iterable of app configs.



        If only_with_models_module in True (non-default), only applications

        containing a models module are considered.

        If only_with_models_module in True (non-default), imports models and

        considers only applications containing a models module.

        """

        if only_with_models_module:

            self.populate_models()

        else:

            self.populate_apps()



        for app_config in self.app_configs.values():

            if only_with_models_module and app_config.models_module is None:

                continue
@@ -159,17 +163,21 @@ class AppCache(object): 


    def get_app_config(self, app_label, only_with_models_module=False):

        """

        Returns the application configuration for the given app_label.

        Imports applications and returns an app config for the given label.



        Raises LookupError if no application exists with this app_label.

        Raises LookupError if no application exists with this label.



        Raises UnavailableApp when set_available_apps() disables the

        application with this app_label.

        application with this label.



        If only_with_models_module in True (non-default), only applications

        containing a models module are considered.

        If only_with_models_module in True (non-default), imports models and

        considers only applications containing a models module.

        """

        if only_with_models_module:

            self.populate_models()

        else:

            self.populate_apps()



        app_config = self.app_configs.get(app_label)

        if app_config is None:

            raise LookupError("No installed app with label %r." % app_label)
@@ -391,7 +399,8 @@ class AppCache(object): 
            "get_app_config(app_label).models_module supersedes get_app(app_label).",

            PendingDeprecationWarning, stacklevel=2)

        try:

            return self.get_app_config(app_label).models_module

            return self.get_app_config(

                app_label, only_with_models_module=True).models_module

        except LookupError as exc:

            # Change the exception type for backwards compatibility.

            raise ImproperlyConfigured(*exc.args)
@@ -403,7 +412,8 @@ class AppCache(object): 
        warnings.warn(

            "[a.models_module for a in get_app_configs()] supersedes get_apps().",

            PendingDeprecationWarning, stacklevel=2)

        return [app_config.models_module for app_config in self.get_app_configs()]

        app_configs = self.get_app_configs(only_with_models_module=True)

        return [app_config.models_module for app_config in app_configs]



    def _get_app_package(self, app):

        return '.'.join(app.__name__.split('.')[:-1])

django/core/management/base.py

+5 −0
Original line number Diff line number Diff line
@@ -344,6 +344,11 @@ class AppCommand(BaseCommand): 
        from django.core.apps import app_cache

        if not app_labels:

            raise CommandError('Enter at least one appname.')

        # Populate models and don't use only_with_models_module=True when

        # calling get_app_config() to tell apart missing apps from apps

        # without a model module -- which can't be supported with the legacy

        # API since it passes the models module to handle_app().

        app_cache.populate_models()

        try:

            app_configs = [app_cache.get_app_config(app_label) for app_label in app_labels]

        except (LookupError, ImportError) as e: