summaryrefslogtreecommitdiff
path: root/django/core/management/commands/loaddata.py
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/core/management/commands/loaddata.py
parent99bd39ef6e1017f75c71fc276f43a941fe6081ea (diff)
Moved apps back in the toplevel django namespace.
Reverted 4a56a93cc458e9ab4dcab95d9f5067d4975dd1a2.
Diffstat (limited to 'django/core/management/commands/loaddata.py')
-rw-r--r--django/core/management/commands/loaddata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index ee88232d9f..bfeba68aa6 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -7,8 +7,8 @@ import warnings
import zipfile
from optparse import make_option
+from django.apps import app_cache
from django.conf import settings
-from django.core.apps import app_cache
from django.core import serializers
from django.core.management.base import BaseCommand, CommandError
from django.core.management.color import no_style