Moved the new app cache inside core.

22 files changed, 26 insertions, 26 deletions

diff --git a/tests/app_cache/models.py b/tests/app_cache/models.py
index cc092390ab..99f9f57b67 100644
--- a/tests/app_cache/models.py
+++ b/tests/app_cache/models.py
@@ -1,4 +1,4 @@
-from django.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 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 484998232e..29d5315de0 100644
--- a/tests/app_cache/tests.py
+++ b/tests/app_cache/tests.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from django.apps import app_cache
-from django.apps.cache import BaseAppCache
+from django.core.apps import app_cache
+from django.core.apps.cache import BaseAppCache
 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 6909564040..3cc0ffb368 100644
--- a/tests/app_loading/tests.py
+++ b/tests/app_loading/tests.py
@@ -4,8 +4,8 @@ import os
 import sys
 from unittest import TestCase
 
-from django.apps import app_cache
-from django.apps.cache import AppCache
+from django.core.apps import app_cache
+from django.core.apps.cache import AppCache
 from django.test.utils import override_settings
 from django.utils._os import upath
 
diff --git a/tests/commands_sql/tests.py b/tests/commands_sql/tests.py
index 1c2a7f0ffa..3088ea4d48 100644
--- a/tests/commands_sql/tests.py
+++ b/tests/commands_sql/tests.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.apps import app_cache
+from django.core.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/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py
index a56d196933..ea61e5e893 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 BaseAppCache
 from django.contrib.contenttypes.models import ContentType
+from django.core.apps.cache import BaseAppCache
 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 442af9f7cf..3e9651b2d2 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/invalid_models/tests.py b/tests/invalid_models/tests.py
index 860d5e23a6..712484c611 100644
--- a/tests/invalid_models/tests.py
+++ b/tests/invalid_models/tests.py
@@ -1,7 +1,7 @@
 import sys
 import unittest
 
-from django.apps import app_cache
+from django.core.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 0c939bfd2e..f2897862ec 100644
--- a/tests/managers_regress/tests.py
+++ b/tests/managers_regress/tests.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.apps import app_cache
+from django.core.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 9726e4457a..03390b3a06 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.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 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 a9503e94a8..59cd56e78b 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.apps import app_cache
+from django.core.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 13e575862d..206bf78b35 100644
--- a/tests/migrations/test_state.py
+++ b/tests/migrations/test_state.py
@@ -1,4 +1,4 @@
-from django.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 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 960af90eaa..76fe5b5a9e 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.apps import app_cache
+from django.core.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 f9ff80485e..34ef724446 100644
--- a/tests/no_models/tests.py
+++ b/tests/no_models/tests.py
@@ -1,4 +1,4 @@
-from django.apps import app_cache
+from django.core.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 4c6e8c433e..861ab4af17 100644
--- a/tests/proxy_model_inheritance/tests.py
+++ b/tests/proxy_model_inheritance/tests.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
 import os
 import sys
 
-from django.apps import app_cache
 from django.conf import settings
+from django.core.apps import app_cache
 from django.core.management import call_command
 from django.test import TestCase, TransactionTestCase
 from django.test.utils import override_settings
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index 0c643991a7..3389f3597f 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 bec2d22fea..d5b94064d5 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -80,14 +80,14 @@ def get_test_modules():
 
 
 def get_installed():
-    from django.apps import app_cache
+    from django.core.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 2df97b935c..e1369bff05 100644
--- a/tests/schema/models.py
+++ b/tests/schema/models.py
@@ -1,4 +1,4 @@
-from django.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 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 0beb95af3e..fec9db5af8 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 a1e2673f38..4a62ad5a45 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/test_runner/tests.py b/tests/test_runner/tests.py
index 03cde80aab..04fa3b8784 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -225,7 +225,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.apps.base import AppConfig
+        from django.core.apps.base import AppConfig
         from django.test.simple import get_tests
         app_config = AppConfig(
             'test_runner.valid_app',
@@ -236,7 +236,7 @@ class ModulesTestsPackages(IgnoreAllDeprecationWarningsMixin, unittest.TestCase)
 
     def test_import_error(self):
         "Test for #12658 - Tests with ImportError's shouldn't fail silently"
-        from django.apps.base import AppConfig
+        from django.core.apps.base import AppConfig
         from django.test.simple import get_tests
         app_config = AppConfig(
             'test_runner_invalid_app',
diff --git a/tests/test_suite_override/tests.py b/tests/test_suite_override/tests.py
index 9666df1c19..b464659275 100644
--- a/tests/test_suite_override/tests.py
+++ b/tests/test_suite_override/tests.py
@@ -1,6 +1,6 @@
 import unittest
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.test.utils import IgnoreAllDeprecationWarningsMixin
 
 
diff --git a/tests/validation/test_unique.py b/tests/validation/test_unique.py
index 995949fed7..83863b19c6 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.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.test import TestCase