summaryrefslogtreecommitdiff
path: root/django/apps
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-01-26 13:17:03 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-01-26 13:17:03 +0100
commit4f03b718f712b39f306f6dfe177e1f65b5437ac2 (patch)
tree114cdd6f9009e35c4ee34905d76d2fda33ad1e30 /django/apps
parentf901b4d6c869f4cfb4fc28a861c481f28e46bb3f (diff)
Fixed #21877 -- Renamed django.apps.base to config.
Diffstat (limited to 'django/apps')
-rw-r--r--django/apps/__init__.py2
-rw-r--r--django/apps/config.py (renamed from django/apps/base.py)0
-rw-r--r--django/apps/registry.py2
3 files changed, 2 insertions, 2 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):