diff options
author | Tim Graham <timograham@gmail.com> | 2015-01-28 07:35:27 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-02-06 08:16:28 -0500 |
commit | 0ed7d155635da9f79d4dd67e4889087d3673c6da (patch) | |
tree | cf5c59b563f01774f32e20b3af8cb24a387fdc4d /tests/apps | |
parent | 388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff) | |
download | django-0ed7d155635da9f79d4dd67e4889087d3673c6da.tar.gz |
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/apps')
-rw-r--r-- | tests/apps/models.py | 1 | ||||
-rw-r--r-- | tests/apps/tests.py | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/apps/models.py b/tests/apps/models.py index d6907eced1..733be35d2e 100644 --- a/tests/apps/models.py +++ b/tests/apps/models.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from django.apps.registry import Apps from django.db import models - # We're testing app registry presence on load, so this is handy. new_apps = Apps(['apps']) diff --git a/tests/apps/tests.py b/tests/apps/tests.py index b7652ed355..5e23ddb9d1 100644 --- a/tests/apps/tests.py +++ b/tests/apps/tests.py @@ -2,22 +2,21 @@ from __future__ import unicode_literals import os import sys -from unittest import skipUnless import warnings +from unittest import skipUnless -from django.apps import apps, AppConfig +from django.apps import AppConfig, apps from django.apps.registry import Apps from django.contrib.admin.models import LogEntry from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase, override_settings from django.test.utils import extend_sys_path -from django.utils._os import upath from django.utils import six +from django.utils._os import upath from .default_config_app.apps import CustomConfig -from .models import TotallyNormal, SoAlternative, new_apps - +from .models import SoAlternative, TotallyNormal, new_apps # Small list with a variety of cases for tests that iterate on installed apps. # Intentionally not in alphabetical order to check if the order is preserved. |