Stopped populating the app registry as a side effect.

Since it triggers imports, it shouldn't be done lightly.

This commit adds a public API for doing it explicitly, django.setup(),
and does it automatically when using manage.py and wsgi.py.

1 files changed, 9 insertions, 0 deletions

diff --git a/django/__init__.py b/django/__init__.py
index 5b4034bfed..61413abe8e 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -6,3 +6,12 @@ def get_version(*args, **kwargs):
     # Only import if it's actually called.
     from django.utils.version import get_version
     return get_version(*args, **kwargs)
+
+
+def setup():
+    # Configure the settings (this happens as a side effect of accessing
+    # INSTALLED_APPS or any other setting) and populate the app registry.
+    from django.apps import apps
+    from django.conf import settings
+    apps.populate_apps(settings.INSTALLED_APPS)
+    apps.populate_models()