summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-22 11:35:17 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-22 11:39:55 +0100
commit2fef9e5375b0267734392080858d9fced15ee2f9 (patch)
tree6bb12e97dd1d607f57f36ae34c0b492dbcf443ba /django/utils
parent99bd39ef6e1017f75c71fc276f43a941fe6081ea (diff)
Moved apps back in the toplevel django namespace.
Reverted 4a56a93cc458e9ab4dcab95d9f5067d4975dd1a2.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/autoreload.py2
-rw-r--r--django/utils/module_loading.py2
-rw-r--r--django/utils/translation/trans_real.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py
index 05ffb12f74..b7a889aa61 100644
--- a/django/utils/autoreload.py
+++ b/django/utils/autoreload.py
@@ -36,8 +36,8 @@ import sys
import time
import traceback
+from django.apps import app_cache
from django.conf import settings
-from django.core.apps import app_cache
from django.core.signals import request_finished
try:
from django.utils.six.moves import _thread as thread
diff --git a/django/utils/module_loading.py b/django/utils/module_loading.py
index 8d95fc00a3..c7826be5e5 100644
--- a/django/utils/module_loading.py
+++ b/django/utils/module_loading.py
@@ -58,7 +58,7 @@ def autodiscover_modules(*args, **kwargs):
registry. This register_to object must have a _registry instance variable
to access it.
"""
- from django.core.apps import app_cache
+ from django.apps import app_cache
register_to = kwargs.get('register_to')
for app_config in app_cache.get_app_configs():
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 3ed6371966..1eced98d31 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -10,7 +10,7 @@ import gettext as gettext_module
from threading import local
import warnings
-from django.core.apps import app_cache
+from django.apps import app_cache
from django.dispatch import receiver
from django.test.signals import setting_changed
from django.utils.encoding import force_str, force_text