summaryrefslogtreecommitdiff
path: root/tests/admin_scripts
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-28 07:35:27 -0500
committerTim Graham <timograham@gmail.com>2015-02-06 08:16:28 -0500
commit0ed7d155635da9f79d4dd67e4889087d3673c6da (patch)
treecf5c59b563f01774f32e20b3af8cb24a387fdc4d /tests/admin_scripts
parent388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff)
downloaddjango-0ed7d155635da9f79d4dd67e4889087d3673c6da.tar.gz
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/admin_scripts')
-rw-r--r--tests/admin_scripts/app_with_import/models.py2
-rw-r--r--tests/admin_scripts/complex_app/admin/foo.py1
-rw-r--r--tests/admin_scripts/tests.py18
-rw-r--r--tests/admin_scripts/urls.py1
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/admin_scripts/app_with_import/models.py b/tests/admin_scripts/app_with_import/models.py
index 89125c386f..3741541628 100644
--- a/tests/admin_scripts/app_with_import/models.py
+++ b/tests/admin_scripts/app_with_import/models.py
@@ -1,5 +1,5 @@
-from django.db import models
from django.contrib.auth.models import User
+from django.db import models
# Regression for #13368. This is an example of a model
diff --git a/tests/admin_scripts/complex_app/admin/foo.py b/tests/admin_scripts/complex_app/admin/foo.py
index 09ceba05aa..adf22b330c 100644
--- a/tests/admin_scripts/complex_app/admin/foo.py
+++ b/tests/admin_scripts/complex_app/admin/foo.py
@@ -2,5 +2,4 @@ from django.contrib import admin
from ..models.foo import Foo
-
admin.site.register(Foo)
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index c7603e3914..319bd47407 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
"""
A series of tests to establish that the command-line management tools work as
-advertised - especially with regards to the handling of the DJANGO_SETTINGS_MODULE
-and default settings.py files.
+advertised - especially with regards to the handling of the
+DJANGO_SETTINGS_MODULE and default settings.py files.
"""
+from __future__ import unicode_literals
import codecs
import os
@@ -19,13 +18,14 @@ import unittest
import django
from django import conf, get_version
from django.conf import settings
-from django.core.management import BaseCommand, CommandError, call_command, color
-from django.utils.encoding import force_text
-from django.utils._os import npath, upath
-from django.utils.six import StringIO
+from django.core.management import (
+ BaseCommand, CommandError, call_command, color,
+)
from django.test import LiveServerTestCase, TestCase, mock, override_settings
from django.test.runner import DiscoverRunner
-
+from django.utils._os import npath, upath
+from django.utils.encoding import force_text
+from django.utils.six import StringIO
test_dir = os.path.realpath(os.path.join(os.environ['DJANGO_TEST_TEMP_DIR'], 'test_project'))
if not os.path.exists(test_dir):
diff --git a/tests/admin_scripts/urls.py b/tests/admin_scripts/urls.py
index b3f4eef15b..d258641fbe 100644
--- a/tests/admin_scripts/urls.py
+++ b/tests/admin_scripts/urls.py
@@ -1,4 +1,5 @@
import os
+
from django.conf.urls import url
from django.utils._os import upath
from django.views.static import serve