summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-11 21:44:27 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-17 10:17:43 +0100
commit860c2c8bc5c77194c41464655851379bf512a052 (patch)
tree98a3688dbbb67151d944dfc8e943b00bced701b1 /django/db/models/__init__.py
parentfe1389e911b0cdc487e5547c09c920c12f4e1ce0 (diff)
downloaddjango-860c2c8bc5c77194c41464655851379bf512a052.tar.gz
Moved django.db.models.loading to django.apps.cache.
This commit doesn't contain any code changes; it's purely a refactoring.
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r--django/db/models/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 12c31f89fd..ad76347494 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -1,9 +1,9 @@
from functools import wraps
-from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured # NOQA
-from django.db.models.loading import ( # NOQA
+from django.apps.cache import ( # NOQA
get_apps, get_app_path, get_app_paths, get_app, get_models, get_model,
register_models, UnavailableApp)
+from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured # NOQA
from django.db.models.query import Q, QuerySet, Prefetch # NOQA
from django.db.models.expressions import F # NOQA
from django.db.models.manager import Manager # NOQA