Moved apps back in the toplevel django namespace.

Reverted 4a56a93cc458e9ab4dcab95d9f5067d4975dd1a2.

31 files changed, 35 insertions, 35 deletions

diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py
index 66c125490f..9e004a5a07 100644
--- a/tests/admin_docs/tests.py
+++ b/tests/admin_docs/tests.py
@@ -1,10 +1,10 @@
 import unittest
 
+from django.apps import app_cache
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.contrib.admindocs import utils
 from django.contrib.auth.models import User
-from django.core.apps import app_cache
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
diff --git a/tests/app_cache/models.py b/tests/app_cache/models.py
index 10e9e6f1de..9306830f9c 100644
--- a/tests/app_cache/models.py
+++ b/tests/app_cache/models.py
@@ -1,4 +1,4 @@
-from django.core.apps.cache import AppCache
+from django.apps.cache import AppCache
 from django.db import models
 
 # We're testing app cache presence on load, so this is handy.
diff --git a/tests/app_cache/tests.py b/tests/app_cache/tests.py
index a531a22e8b..43133ab38f 100644
--- a/tests/app_cache/tests.py
+++ b/tests/app_cache/tests.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from django.core.apps import app_cache
-from django.core.apps.cache import AppCache
+from django.apps import app_cache
+from django.apps.cache import AppCache
 from django.db import models
 from django.test import TestCase
 
diff --git a/tests/app_loading/tests.py b/tests/app_loading/tests.py
index dcd0fa34c0..0692597a5b 100644
--- a/tests/app_loading/tests.py
+++ b/tests/app_loading/tests.py
@@ -5,8 +5,8 @@ import sys
 from unittest import TestCase
 import warnings
 
-from django.core.apps import app_cache
-from django.core.apps.cache import AppCache
+from django.apps import app_cache
+from django.apps.cache import AppCache
 from django.test.utils import override_settings
 from django.utils._os import upath
 from django.utils import six
diff --git a/tests/bash_completion/tests.py b/tests/bash_completion/tests.py
index 85fb58904c..5a6a6c48d2 100644
--- a/tests/bash_completion/tests.py
+++ b/tests/bash_completion/tests.py
@@ -5,7 +5,7 @@ import os
 import sys
 import unittest
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.management import ManagementUtility
 from django.utils.six import StringIO
 
diff --git a/tests/commands_sql/tests.py b/tests/commands_sql/tests.py
index 3088ea4d48..1c2a7f0ffa 100644
--- a/tests/commands_sql/tests.py
+++ b/tests/commands_sql/tests.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.management.color import no_style
 from django.core.management.sql import (sql_create, sql_delete, sql_indexes,
     sql_destroy_indexes, sql_all)
diff --git a/tests/comment_tests/tests/test_app_api.py b/tests/comment_tests/tests/test_app_api.py
index 645daf123d..7098def28a 100644
--- a/tests/comment_tests/tests/test_app_api.py
+++ b/tests/comment_tests/tests/test_app_api.py
@@ -1,8 +1,8 @@
+from django.apps import app_cache
 from django.conf import settings
 from django.contrib import comments
 from django.contrib.comments.models import Comment
 from django.contrib.comments.forms import CommentForm
-from django.core.apps import app_cache
 from django.core.exceptions import ImproperlyConfigured
 from django.test.utils import override_settings
 from django.utils import six
diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py
index 9cc254e665..d3c19fd910 100644
--- a/tests/contenttypes_tests/tests.py
+++ b/tests/contenttypes_tests/tests.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
+from django.apps.cache import AppCache
 from django.contrib.contenttypes.models import ContentType
-from django.core.apps.cache import AppCache
 from django.db import models
 from django.test import TestCase
 
diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py
index 3e9651b2d2..442af9f7cf 100644
--- a/tests/defer_regress/tests.py
+++ b/tests/defer_regress/tests.py
@@ -2,9 +2,9 @@ from __future__ import unicode_literals
 
 from operator import attrgetter
 
+from django.apps import app_cache
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sessions.backends.db import SessionStore
-from django.core.apps import app_cache
 from django.db.models import Count
 from django.test import TestCase
 from django.test.utils import override_settings
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 339317c541..8d8b5fbe9c 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -8,8 +8,8 @@ import os
 import pickle
 from threading import local
 
+from django.apps import app_cache
 from django.conf import settings
-from django.core.apps import app_cache
 from django.template import Template, Context
 from django.template.base import TemplateSyntaxError
 from django.test import TestCase, RequestFactory
diff --git a/tests/invalid_models_tests/tests.py b/tests/invalid_models_tests/tests.py
index 4e0cef546b..09c19d453c 100644
--- a/tests/invalid_models_tests/tests.py
+++ b/tests/invalid_models_tests/tests.py
@@ -1,7 +1,7 @@
 import sys
 import unittest
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.management.validation import get_validation_errors
 from django.test.utils import override_settings
 from django.utils.six import StringIO
diff --git a/tests/managers_regress/tests.py b/tests/managers_regress/tests.py
index b9c8244612..9d7e0d8174 100644
--- a/tests/managers_regress/tests.py
+++ b/tests/managers_regress/tests.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.db import models
 from django.template import Context, Template
 from django.test import TestCase
diff --git a/tests/migrations/models.py b/tests/migrations/models.py
index cfc9604551..b1ef6c1dd1 100644
--- a/tests/migrations/models.py
+++ b/tests/migrations/models.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.core.apps.cache import AppCache
+from django.apps.cache import AppCache
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py
index 13514cac91..fcb460decc 100644
--- a/tests/migrations/test_commands.py
+++ b/tests/migrations/test_commands.py
@@ -5,7 +5,7 @@ import codecs
 import os
 import shutil
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.management import call_command, CommandError
 from django.test.utils import override_settings
 from django.utils import six
diff --git a/tests/migrations/test_state.py b/tests/migrations/test_state.py
index 7a06ecd474..e695248cd2 100644
--- a/tests/migrations/test_state.py
+++ b/tests/migrations/test_state.py
@@ -1,4 +1,4 @@
-from django.core.apps.cache import AppCache
+from django.apps.cache import AppCache
 from django.db import models
 from django.db.migrations.state import ProjectState, ModelState, InvalidBasesError
 from django.test import TestCase
diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py
index 3f46703207..df3d052610 100644
--- a/tests/migrations/test_writer.py
+++ b/tests/migrations/test_writer.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import datetime
 import os
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.validators import RegexValidator, EmailValidator
 from django.db import models, migrations
 from django.db.migrations.writer import MigrationWriter
diff --git a/tests/no_models/tests.py b/tests/no_models/tests.py
index 34ef724446..f9ff80485e 100644
--- a/tests/no_models/tests.py
+++ b/tests/no_models/tests.py
@@ -1,4 +1,4 @@
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.test import TestCase
 
 
diff --git a/tests/proxy_model_inheritance/tests.py b/tests/proxy_model_inheritance/tests.py
index 5f33ec2fee..c0b564746d 100644
--- a/tests/proxy_model_inheritance/tests.py
+++ b/tests/proxy_model_inheritance/tests.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import os
 import sys
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.management import call_command
 from django.test import TestCase, TransactionTestCase
 from django.utils._os import upath
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index 0995a778c0..800fc42e6d 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
+from django.apps import app_cache
 from django.contrib import admin
 from django.contrib.contenttypes.models import ContentType
 from django.core import management
-from django.core.apps import app_cache
 from django.core.exceptions import FieldError
 from django.db import models, DEFAULT_DB_ALIAS
 from django.db.models import signals
diff --git a/tests/runtests.py b/tests/runtests.py
index 64d363a095..88973308cf 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -80,14 +80,14 @@ def get_test_modules():
 
 
 def get_installed():
-    from django.core.apps import app_cache
+    from django.apps import app_cache
     return [app_config.name for app_config in app_cache.get_app_configs()]
 
 
 def setup(verbosity, test_labels):
     import django
+    from django.apps import app_cache
     from django.conf import settings
-    from django.core.apps import app_cache
     from django.test import TransactionTestCase, TestCase
 
     print("Testing against Django installed in '%s'" % os.path.dirname(django.__file__))
diff --git a/tests/schema/models.py b/tests/schema/models.py
index 8b24b88c05..b294647f9b 100644
--- a/tests/schema/models.py
+++ b/tests/schema/models.py
@@ -1,4 +1,4 @@
-from django.core.apps.cache import AppCache
+from django.apps.cache import AppCache
 from django.db import models
 
 # Because we want to test creation and deletion of these as separate things,
diff --git a/tests/swappable_models/tests.py b/tests/swappable_models/tests.py
index fec9db5af8..0beb95af3e 100644
--- a/tests/swappable_models/tests.py
+++ b/tests/swappable_models/tests.py
@@ -2,9 +2,9 @@ from __future__ import unicode_literals
 
 from django.utils.six import StringIO
 
+from django.apps import app_cache
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
-from django.core.apps import app_cache
 from django.core import management
 from django.test import TestCase
 from django.test.utils import override_settings
diff --git a/tests/tablespaces/tests.py b/tests/tablespaces/tests.py
index fa90704c45..d761a93ab9 100644
--- a/tests/tablespaces/tests.py
+++ b/tests/tablespaces/tests.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
+from django.apps import app_cache
 from django.conf import settings
-from django.core.apps import app_cache
 from django.db import connection
 from django.core.management.color import no_style
 from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py
index 551bd7fb72..eadb3fb02a 100644
--- a/tests/template_tests/test_loaders.py
+++ b/tests/template_tests/test_loaders.py
@@ -20,7 +20,7 @@ except ImportError:
     pkg_resources = None
 
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.template import TemplateDoesNotExist, Context
 from django.template.loaders.eggs import Loader as EggLoader
 from django.template import loader
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index 61a46a81f9..4dc0925070 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -16,7 +16,7 @@ import unittest
 import warnings
 
 from django import template
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core import urlresolvers
 from django.template import (base as template_base, loader, Context,
     RequestContext, Template, TemplateSyntaxError)
diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py
index 3c365b0225..5393ea75a2 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -224,7 +224,7 @@ class ModulesTestsPackages(IgnoreAllDeprecationWarningsMixin, unittest.TestCase)
 
     def test_get_tests(self):
         "Check that the get_tests helper function can find tests in a directory"
-        from django.core.apps.base import AppConfig
+        from django.apps.base import AppConfig
         from django.test.simple import get_tests
         app_config = AppConfig.create('test_runner.valid_app')
         app_config.import_models({})
@@ -233,7 +233,7 @@ class ModulesTestsPackages(IgnoreAllDeprecationWarningsMixin, unittest.TestCase)
 
     def test_import_error(self):
         "Test for #12658 - Tests with ImportError's shouldn't fail silently"
-        from django.core.apps.base import AppConfig
+        from django.apps.base import AppConfig
         from django.test.simple import get_tests
         app_config = AppConfig.create('test_runner_invalid_app')
         app_config.import_models({})
diff --git a/tests/test_suite_override/tests.py b/tests/test_suite_override/tests.py
index b464659275..9666df1c19 100644
--- a/tests/test_suite_override/tests.py
+++ b/tests/test_suite_override/tests.py
@@ -1,6 +1,6 @@
 import unittest
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.test.utils import IgnoreAllDeprecationWarningsMixin
 
 
diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py
index 47c70fae92..5071566e92 100644
--- a/tests/utils_tests/test_autoreload.py
+++ b/tests/utils_tests/test_autoreload.py
@@ -1,8 +1,8 @@
 import os
 
 from django import conf
+from django.apps import app_cache
 from django.contrib import admin
-from django.core.apps import app_cache
 from django.test import TestCase, override_settings
 from django.utils.autoreload import gen_filenames
 
diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py
index 0c8dfe1e12..baaab36494 100644
--- a/tests/utils_tests/test_module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -5,7 +5,7 @@ import sys
 import unittest
 from zipimport import zipimporter
 
-from django.core.apps import app_cache
+from django.apps import app_cache
 from django.core.exceptions import ImproperlyConfigured
 from django.test import SimpleTestCase
 from django.utils import six
diff --git a/tests/validation/test_unique.py b/tests/validation/test_unique.py
index f05256a6f1..be7808f460 100644
--- a/tests/validation/test_unique.py
+++ b/tests/validation/test_unique.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import datetime
 import unittest
 
-from django.core.apps.cache import AppCache
+from django.apps.cache import AppCache
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.test import TestCase
diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index 19bbde286c..1e4eff66df 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -4,8 +4,8 @@ import os
 from os import path
 import unittest
 
+from django.apps import app_cache
 from django.conf import settings
-from django.core.apps import app_cache
 from django.core.urlresolvers import reverse
 from django.test import LiveServerTestCase, TestCase
 from django.test.utils import override_settings