diff options
| -rw-r--r-- | django/apps/__init__.py | 2 | ||||
| -rw-r--r-- | django/apps/config.py (renamed from django/apps/base.py) | 0 | ||||
| -rw-r--r-- | django/apps/registry.py | 2 | ||||
| -rw-r--r-- | django/db/models/base.py | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/django/apps/__init__.py b/django/apps/__init__.py index 074a448660..de0f303846 100644 --- a/django/apps/__init__.py +++ b/django/apps/__init__.py @@ -1,2 +1,2 @@ -from .base import AppConfig # NOQA +from .config import AppConfig # NOQA from .registry import apps # NOQA diff --git a/django/apps/base.py b/django/apps/config.py index e25178e25d..e25178e25d 100644 --- a/django/apps/base.py +++ b/django/apps/config.py diff --git a/django/apps/registry.py b/django/apps/registry.py index 7cf5a2637b..601091cfb7 100644 --- a/django/apps/registry.py +++ b/django/apps/registry.py @@ -8,7 +8,7 @@ from django.core.exceptions import ImproperlyConfigured from django.utils import lru_cache from django.utils._os import upath -from .base import AppConfig +from .config import AppConfig class Apps(object): diff --git a/django/db/models/base.py b/django/db/models/base.py index 65e1f5d9e4..e689f7be8a 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -6,7 +6,7 @@ from functools import update_wrapper import warnings from django.apps import apps -from django.apps.base import MODELS_MODULE_NAME +from django.apps.config import MODELS_MODULE_NAME import django.db.models.manager # NOQA: Imported to register signal handler. from django.conf import settings from django.core import checks |