summaryrefslogtreecommitdiff
path: root/django/__init__.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-30 23:15:29 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-30 23:18:22 +0100
commit1c242a297b5b1857d76cab9b24f9f1d3b7f5240d (patch)
treec4b71fc8488eca72d41e344490e8ed9c7afa912d /django/__init__.py
parent966de8497373dc47756105516b4b839734ed316e (diff)
Merged Apps.populate_apps() and populate_models().
After the recent series of refactorings, there's no reason to keep two distinct methods. Refs #21681.
Diffstat (limited to 'django/__init__.py')
-rw-r--r--django/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 61413abe8e..69be8c9984 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -13,5 +13,4 @@ def setup():
# 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()
+ apps.populate(settings.INSTALLED_APPS)