Moved the new app cache inside core.

django/contrib/admin/validation.py

@@ -1,4 +1,4 @@
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.db.models.fields import FieldDoesNotExist

django/contrib/admindocs/views.py

@@ -4,10 +4,10 @@ import os
 import re
 
 from django import template
-from django.apps import app_cache
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.views.decorators import staff_member_required
+from django.core.apps import app_cache
 from django.db import models
 from django.core.exceptions import ViewDoesNotExist
 from django.http import Http404

django/contrib/auth/__init__.py

@@ -123,7 +123,7 @@ def get_user_model():
     """
     Returns the User model that is active in this project.
     """
-    from django.apps import app_cache
+    from django.core.apps import app_cache
 
     try:
         app_label, model_name = settings.AUTH_USER_MODEL.split('.')

django/contrib/auth/management/__init__.py

@@ -6,9 +6,9 @@ from __future__ import unicode_literals
 import getpass
 import unicodedata
 
-from django.apps import app_cache, UnavailableApp
 from django.contrib.auth import (models as auth_app, get_permission_codename,
     get_user_model)
+from django.core.apps import app_cache, UnavailableApp
 from django.core import exceptions
 from django.core.management.base import CommandError
 from django.db import DEFAULT_DB_ALIAS, router

django/contrib/auth/tests/test_management.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 from datetime import date
 
-from django.apps import app_cache
 from django.contrib.auth import models, management
 from django.contrib.auth.management import create_permissions
 from django.contrib.auth.management.commands import changepassword
@@ -9,6 +8,7 @@ from django.contrib.auth.models import User
 from django.contrib.auth.tests.custom_user import CustomUser
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.contenttypes.models import ContentType
+from django.core.apps import app_cache
 from django.core import exceptions
 from django.core.management import call_command
 from django.core.management.base import CommandError

django/contrib/comments/views/comments.py

@@ -1,9 +1,9 @@
 from django import http
-from django.apps import app_cache
 from django.conf import settings
 from django.contrib import comments
 from django.contrib.comments import signals
 from django.contrib.comments.views.utils import next_redirect, confirmation_view
+from django.core.apps import app_cache
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
 from django.shortcuts import render_to_response

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

django/contrib/contenttypes/models.py

@@ -1,4 +1,4 @@
-from django.apps import app_cache
+from django.core.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

django/contrib/gis/sitemaps/kml.py

@@ -1,4 +1,4 @@
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.core import urlresolvers
 from django.contrib.sitemaps import Sitemap
 from django.contrib.gis.db.models.fields import GeometryField

django/contrib/gis/sitemaps/views.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import warnings
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.http import HttpResponse, Http404
 from django.template import loader
 from django.contrib.sites.models import get_current_site

django/core/checks/compatibility/django_1_6_0.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
 
 

django/core/management/base.py

@@ -341,7 +341,7 @@ class AppCommand(BaseCommand):
     args = '<appname appname ...>'
 
     def handle(self, *app_labels, **options):
-        from django.apps import app_cache
+        from django.core.apps import app_cache
         if not app_labels:
             raise CommandError('Enter at least one appname.')
         try:

django/core/management/commands/dumpdata.py

@@ -37,7 +37,7 @@ class Command(BaseCommand):
     args = '[appname appname.ModelName ...]'
 
     def handle(self, *app_labels, **options):
-        from django.apps import app_cache
+        from django.core.apps import app_cache
 
         format = options.get('format')
         indent = options.get('indent')
@@ -162,7 +162,7 @@ def sort_dependencies(app_list):
     is serialized before a normal model, and any model with a natural key
     dependency has it's dependencies serialized first.
     """
-    from django.apps import app_cache
+    from django.core.apps import app_cache
     # Process the list of models, and get the list of dependencies
     model_dependencies = []
     models = set()

django/core/management/commands/flush.py

@@ -2,8 +2,8 @@ import sys
 from importlib import import_module
 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.db import connections, router, transaction, DEFAULT_DB_ALIAS
 from django.core.management import call_command
 from django.core.management.base import NoArgsCommand, CommandError

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

django/core/management/commands/makemigrations.py

@@ -3,7 +3,7 @@ import os
 import operator
 from optparse import make_option
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connections, DEFAULT_DB_ALIAS, migrations
 from django.db.migrations.loader import MigrationLoader

django/core/management/commands/migrate.py

@@ -6,8 +6,8 @@ from importlib import import_module
 import itertools
 import traceback
 
-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.core.management.base import BaseCommand, CommandError
 from django.core.management.color import no_style

django/core/management/commands/shell.py

@@ -66,7 +66,7 @@ class Command(NoArgsCommand):
     def handle_noargs(self, **options):
         # XXX: (Temporary) workaround for ticket #1796: force early loading of all
         # models from installed apps.
-        from django.apps import app_cache
+        from django.core.apps import app_cache
         app_cache.get_models()
 
         use_plain = options.get('plain', False)

django/core/management/commands/sqlsequencereset.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from optparse import make_option
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.core.management.base import AppCommand
 from django.db import connections, DEFAULT_DB_ALIAS
 

django/core/management/sql.py

@@ -5,8 +5,8 @@ import os
 import re
 import warnings
 
-from django.apps import app_cache
 from django.conf import settings
+from django.core.apps import app_cache
 from django.core.management.base import CommandError
 from django.db import models, router
 

django/core/management/validation.py

@@ -26,7 +26,7 @@ def get_validation_errors(outfile, app=None):
     validates all models of all installed apps. Writes errors, if any, to outfile.
     Returns number of errors.
     """
-    from django.apps import app_cache
+    from django.core.apps import app_cache
     from django.db import connection, models
     from django.db.models.deletion import SET_NULL, SET_DEFAULT
 

django/core/serializers/base.py

@@ -3,7 +3,7 @@ Module for abstract serializer/unserializer base classes.
 """
 import warnings
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.db import models
 from django.utils import six
 

django/core/serializers/python.py

@@ -5,8 +5,8 @@ other serializers.
 """
 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.core.serializers import base
 from django.db import models, DEFAULT_DB_ALIAS
 from django.utils.encoding import smart_text, is_protected_type

django/core/serializers/xml_serializer.py

@@ -4,8 +4,8 @@ XML serializer.
 
 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.core.serializers import base
 from django.db import models, DEFAULT_DB_ALIAS
 from django.utils.xmlutils import SimplerXMLGenerator

django/db/backends/__init__.py

@@ -1268,7 +1268,7 @@ class BaseDatabaseIntrospection(object):
         If only_existing is True, the resulting list will only include the tables
         that actually exist in the database.
         """
-        from django.apps import app_cache
+        from django.core.apps import app_cache
         from django.db import router
         tables = set()
         for app_config in app_cache.get_app_configs(only_with_models_module=True):
@@ -1289,7 +1289,7 @@ class BaseDatabaseIntrospection(object):
 
     def installed_models(self, tables):
         "Returns a set of all models represented by the provided list of table names."
-        from django.apps import app_cache
+        from django.core.apps import app_cache
         from django.db import router
         all_models = []
         for app_config in app_cache.get_app_configs(only_with_models_module=True):
@@ -1302,7 +1302,7 @@ class BaseDatabaseIntrospection(object):
 
     def sequence_list(self):
         "Returns a list of information about all DB sequences for all models in all apps."
-        from django.apps import app_cache
+        from django.core.apps import app_cache
         from django.db import models, router
 
         sequence_list = []

django/db/backends/sqlite3/schema.py

@@ -1,4 +1,4 @@
-from django.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 from django.db.backends.schema import BaseDatabaseSchemaEditor
 from django.db.models.fields.related import ManyToManyField
 

django/db/migrations/loader.py

@@ -2,7 +2,7 @@ from importlib import import_module
 import os
 import sys
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.db.migrations.recorder import MigrationRecorder
 from django.db.migrations.graph import MigrationGraph
 from django.utils import six

django/db/migrations/questioner.py

@@ -2,7 +2,7 @@ import importlib
 import os
 import sys
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.utils import datetime_safe
 from django.utils.six.moves import input
 

django/db/migrations/recorder.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.utils.timezone import now
 

django/db/migrations/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.models.options import DEFAULT_NAMES, normalize_unique_together
 from django.utils import six

django/db/migrations/writer.py

@@ -5,7 +5,7 @@ from importlib import import_module
 import os
 import types
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.db import models
 from django.db.migrations.loader import MigrationLoader
 from django.utils.encoding import force_text

django/db/models/base.py

@@ -5,8 +5,8 @@ import sys
 from functools import update_wrapper
 from django.utils.six.moves import zip
 
-from django.apps import app_cache
+from django.core.apps import app_cache
-from django.apps.cache import MODELS_MODULE_NAME
+from django.core.apps.cache import MODELS_MODULE_NAME
 import django.db.models.manager  # NOQA: Imported to register signal handler.
 from django.conf import settings
 from django.core.exceptions import (ObjectDoesNotExist,

django/db/models/fields/__init__.py

@@ -9,7 +9,7 @@ import warnings
 from base64 import b64decode, b64encode
 from itertools import tee
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.db import connection
 from django.db.models.query_utils import QueryWrapper
 from django.conf import settings

django/db/models/loading.py

@@ -1,6 +1,6 @@
 import warnings
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 
 warnings.warn(
     "The utilities in django.db.models.loading are deprecated "

django/db/models/options.py

@@ -5,8 +5,8 @@ import re
 from bisect import bisect
 import warnings
 
-from django.apps import app_cache
 from django.conf import settings
+from django.core.apps import app_cache
 from django.db.models.fields.related import ManyToManyRel
 from django.db.models.fields import AutoField, FieldDoesNotExist
 from django.db.models.fields.proxy import OrderWrt

django/db/models/signals.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.dispatch import Signal
 from django.utils import six
 

django/db/utils.py

@@ -282,6 +282,6 @@ class ConnectionRouter(object):
         """
         Return app models allowed to be synchronized on provided db.
         """
-        from django.apps import app_cache
+        from django.core.apps import app_cache
         return [model for model in app_cache.get_models(app, include_auto_created=include_auto_created)
                 if self.allow_migrate(db, model)]

django/test/simple.py

@@ -9,7 +9,7 @@ import re
 import unittest as real_unittest
 import warnings
 
-from django.apps import app_cache
+from django.core.apps import app_cache
 from django.test import _doctest as doctest
 from django.test import runner
 from django.test.utils import compare_xml, strip_quotes

django/test/testcases.py

@@ -15,9 +15,9 @@ import unittest
 from unittest import skipIf         # NOQA: Imported here for backward compatibility
 from unittest.util import safe_repr
 
-from django.apps import app_cache
 from django.conf import settings
 from django.core import mail
+from django.core.apps import app_cache
 from django.core.exceptions import ValidationError, ImproperlyConfigured
 from django.core.handlers.wsgi import get_path_info, WSGIHandler
 from django.core.management import call_command

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.

tests/app_cache/tests.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from django.apps import app_cache
+from django.core.apps import app_cache
-from django.apps.cache import BaseAppCache
+from django.core.apps.cache import BaseAppCache
 from django.db import models
 from django.test import TestCase
 

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.core.apps import app_cache
-from django.apps.cache import AppCache
+from django.core.apps.cache import AppCache
 from django.test.utils import override_settings
 from django.utils._os import upath
 

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)

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
 

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

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

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

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
 

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

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

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

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
 
 

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

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

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__))

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,

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

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

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',

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
 
 

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