diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-22 11:35:17 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-22 11:39:55 +0100 |
| commit | 2fef9e5375b0267734392080858d9fced15ee2f9 (patch) | |
| tree | 6bb12e97dd1d607f57f36ae34c0b492dbcf443ba /django/contrib/contenttypes | |
| parent | 99bd39ef6e1017f75c71fc276f43a941fe6081ea (diff) | |
Moved apps back in the toplevel django namespace.
Reverted 4a56a93cc458e9ab4dcab95d9f5067d4975dd1a2.
Diffstat (limited to 'django/contrib/contenttypes')
| -rw-r--r-- | django/contrib/contenttypes/management.py | 2 | ||||
| -rw-r--r-- | django/contrib/contenttypes/models.py | 2 | ||||
| -rw-r--r-- | django/contrib/contenttypes/tests.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py index 7ff08b70f8..35a8a7fdc8 100644 --- a/django/contrib/contenttypes/management.py +++ b/django/contrib/contenttypes/management.py @@ -1,5 +1,5 @@ +from django.apps import app_cache, UnavailableApp from django.contrib.contenttypes.models import ContentType -from django.core.apps import app_cache, UnavailableApp from django.db import DEFAULT_DB_ALIAS, router from django.db.models import signals from django.utils.encoding import smart_text diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py index 98eae0219c..90dea5b811 100644 --- a/django/contrib/contenttypes/models.py +++ b/django/contrib/contenttypes/models.py @@ -1,4 +1,4 @@ -from django.core.apps import app_cache +from django.apps import app_cache from django.db import models from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import smart_text, force_text diff --git a/django/contrib/contenttypes/tests.py b/django/contrib/contenttypes/tests.py index b194755b80..302cdbb5cf 100644 --- a/django/contrib/contenttypes/tests.py +++ b/django/contrib/contenttypes/tests.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals +from django.apps import app_cache from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.views import shortcut from django.contrib.sites.models import get_current_site -from django.core.apps import app_cache from django.db import models from django.http import HttpRequest, Http404 from django.test import TestCase |
