summaryrefslogtreecommitdiff
path: root/django/apps
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-09 13:19:34 -0500
committerTim Graham <timograham@gmail.com>2015-02-09 14:24:06 -0500
commita8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch)
tree94ef5bc53e59131906aecfcf792eeac86242aa62 /django/apps
parenteb406aa686ff1809903366ef6896037af2f1f69b (diff)
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/apps')
-rw-r--r--django/apps/config.py5
-rw-r--r--django/apps/registry.py4
2 files changed, 4 insertions, 5 deletions
diff --git a/django/apps/config.py b/django/apps/config.py
index fd0e2fe78c..76b3014d9d 100644
--- a/django/apps/config.py
+++ b/django/apps/config.py
@@ -1,10 +1,9 @@
-from importlib import import_module
import os
+from importlib import import_module
from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
-from django.utils.module_loading import module_has_submodule
from django.utils._os import upath
-
+from django.utils.module_loading import module_has_submodule
MODELS_MODULE_NAME = 'models'
diff --git a/django/apps/registry.py b/django/apps/registry.py
index efef0c9174..0cda55d8fa 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -1,13 +1,13 @@
-from collections import Counter, defaultdict, OrderedDict
import os
import sys
import threading
import warnings
+from collections import Counter, OrderedDict, defaultdict
from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
from django.utils import lru_cache
-from django.utils.deprecation import RemovedInDjango19Warning
from django.utils._os import upath
+from django.utils.deprecation import RemovedInDjango19Warning
from .config import AppConfig