[1.8.x] Sorted imports with isort; refs #23860.

Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master

17 files changed, 23 insertions, 34 deletions

diff --git a/tests/urlpatterns_reverse/extra_urls.py b/tests/urlpatterns_reverse/extra_urls.py
index c30a61a99a..d9c518c219 100644
--- a/tests/urlpatterns_reverse/extra_urls.py
+++ b/tests/urlpatterns_reverse/extra_urls.py
@@ -2,11 +2,10 @@
 Some extra URL patterns that are included at the top level.
 """
 
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^e-places/([0-9]+)/$', empty_view, name='extra-places'),
     url(r'^e-people/(?P<name>\w+)/$', empty_view, name="extra-people"),
diff --git a/tests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py
index a4c6afea57..fac37ef714 100644
--- a/tests/urlpatterns_reverse/included_named_urls.py
+++ b/tests/urlpatterns_reverse/included_named_urls.py
@@ -1,8 +1,7 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^$', empty_view, name="named-url3"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url4"),
diff --git a/tests/urlpatterns_reverse/included_named_urls2.py b/tests/urlpatterns_reverse/included_named_urls2.py
index 47411ec620..4d617c3790 100644
--- a/tests/urlpatterns_reverse/included_named_urls2.py
+++ b/tests/urlpatterns_reverse/included_named_urls2.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^$', empty_view, name="named-url5"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url6"),
diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
index 2472e7c07d..8769f112e9 100644
--- a/tests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/urlpatterns_reverse/included_namespace_urls.py
@@ -1,12 +1,11 @@
 import warnings
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.utils.deprecation import RemovedInDjango20Warning
 
 from .namespace_urls import URLObject
 from .views import view_class_instance
 
-
 testobj3 = URLObject('testapp', 'test-ns3')
 
 # test deprecated patterns() function. convert to list of urls() in Django 2.0
diff --git a/tests/urlpatterns_reverse/included_no_kwargs_urls.py b/tests/urlpatterns_reverse/included_no_kwargs_urls.py
index 0c291e0de2..f124a09b2f 100644
--- a/tests/urlpatterns_reverse/included_no_kwargs_urls.py
+++ b/tests/urlpatterns_reverse/included_no_kwargs_urls.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^inner-no-kwargs/([0-9]+)/', empty_view, name="inner-no-kwargs")
 ]
diff --git a/tests/urlpatterns_reverse/included_urls.py b/tests/urlpatterns_reverse/included_urls.py
index f8e69cb761..240d9e5665 100644
--- a/tests/urlpatterns_reverse/included_urls.py
+++ b/tests/urlpatterns_reverse/included_urls.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^$', empty_view, name="inner-nothing"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="inner-extra"),
diff --git a/tests/urlpatterns_reverse/included_urls2.py b/tests/urlpatterns_reverse/included_urls2.py
index ac8c770e7f..4a4aef8d95 100644
--- a/tests/urlpatterns_reverse/included_urls2.py
+++ b/tests/urlpatterns_reverse/included_urls2.py
@@ -9,7 +9,6 @@ from django.conf.urls import url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^part/(?P<value>\w+)/$', empty_view, name="part"),
     url(r'^part2/(?:(?P<value>\w+)/)?$', empty_view, name="part2"),
diff --git a/tests/urlpatterns_reverse/named_urls.py b/tests/urlpatterns_reverse/named_urls.py
index 3f31249735..647c2630cf 100644
--- a/tests/urlpatterns_reverse/named_urls.py
+++ b/tests/urlpatterns_reverse/named_urls.py
@@ -1,8 +1,7 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from .views import empty_view
 
-
 urlpatterns = [
     url(r'^$', empty_view, name="named-url1"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url2"),
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
index 12cf85f7d3..e1bb7479e9 100644
--- a/tests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/urlpatterns_reverse/namespace_urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from . import views
 
diff --git a/tests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/urlpatterns_reverse/reverse_lazy_urls.py
index 76ff67b2c0..c1bccea2a5 100644
--- a/tests/urlpatterns_reverse/reverse_lazy_urls.py
+++ b/tests/urlpatterns_reverse/reverse_lazy_urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from .views import empty_view, LazyRedirectView, login_required_view
+from .views import LazyRedirectView, empty_view, login_required_view
 
 urlpatterns = [
     url(r'^redirected_to/$', empty_view, name='named-lazy-url-redirected-to'),
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index d2fa1a9825..8ca55b9353 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -7,24 +7,26 @@ from __future__ import unicode_literals
 import sys
 import unittest
 
-from django.contrib.auth.models import User
+from admin_scripts.tests import AdminScriptTestCase
+
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
-from django.core.urlresolvers import (reverse, reverse_lazy, resolve, get_callable,
-    get_resolver, NoReverseMatch, Resolver404, ResolverMatch, RegexURLResolver,
-    RegexURLPattern)
-from django.http import HttpRequest, HttpResponseRedirect, HttpResponsePermanentRedirect
+from django.core.urlresolvers import (
+    NoReverseMatch, RegexURLPattern, RegexURLResolver, Resolver404,
+    ResolverMatch, get_callable, get_resolver, resolve, reverse, reverse_lazy,
+)
+from django.http import (
+    HttpRequest, HttpResponsePermanentRedirect, HttpResponseRedirect,
+)
 from django.shortcuts import redirect
 from django.test import TestCase, ignore_warnings, override_settings
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango20Warning
 
-from admin_scripts.tests import AdminScriptTestCase
-
-from . import urlconf_outer, middleware, views
+from . import middleware, urlconf_outer, views
 from .views import empty_view
 
-
 resolve_test_data = (
     # These entries are in the format: (path, url_name, app_name, namespace, view_name, func, args, kwargs)
     # Simple case
diff --git a/tests/urlpatterns_reverse/urlconf_inner.py b/tests/urlpatterns_reverse/urlconf_inner.py
index d55c4dc650..2a8ed7e26f 100644
--- a/tests/urlpatterns_reverse/urlconf_inner.py
+++ b/tests/urlpatterns_reverse/urlconf_inner.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
-from django.template import Template, Context
 from django.http import HttpResponse
+from django.template import Context, Template
 
 
 def inner_view(request):
diff --git a/tests/urlpatterns_reverse/urlconf_outer.py b/tests/urlpatterns_reverse/urlconf_outer.py
index 36b6529efa..65cf507aa4 100644
--- a/tests/urlpatterns_reverse/urlconf_outer.py
+++ b/tests/urlpatterns_reverse/urlconf_outer.py
@@ -1,8 +1,7 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from . import urlconf_inner
 
-
 urlpatterns = [
     url(r'^test/me/$', urlconf_inner.inner_view, name='outer'),
     url(r'^inner_urlconf/', include(urlconf_inner.__name__))
diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
index 825ded40a2..9b5a5f29fa 100644
--- a/tests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -1,6 +1,6 @@
 import warnings
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import include, patterns, url
 from django.utils.deprecation import RemovedInDjango20Warning
 
 from .views import (
@@ -8,7 +8,6 @@ from .views import (
     empty_view_wrapped, nested_view,
 )
 
-
 other_patterns = [
     url(r'non_path_include/$', empty_view, name='non_path_include'),
     url(r'nested_path/$', nested_view),
diff --git a/tests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/urlpatterns_reverse/urls_error_handlers_callables.py
index 5fe8c728ff..4a8d35116e 100644
--- a/tests/urlpatterns_reverse/urls_error_handlers_callables.py
+++ b/tests/urlpatterns_reverse/urls_error_handlers_callables.py
@@ -2,7 +2,6 @@
 
 from .views import empty_view
 
-
 urlpatterns = []
 
 handler400 = empty_view
diff --git a/tests/urlpatterns_reverse/urls_without_full_import.py b/tests/urlpatterns_reverse/urls_without_full_import.py
index 5178a9cfe0..5bbb0955e6 100644
--- a/tests/urlpatterns_reverse/urls_without_full_import.py
+++ b/tests/urlpatterns_reverse/urls_without_full_import.py
@@ -3,8 +3,7 @@
 # import pattern.
 from django.conf.urls import url
 
-from .views import empty_view, bad_view
-
+from .views import bad_view, empty_view
 
 urlpatterns = [
     url(r'^test_view/$', empty_view, name="test_view"),
diff --git a/tests/urlpatterns_reverse/views.py b/tests/urlpatterns_reverse/views.py
index efd5689c31..9fd2ad166e 100644
--- a/tests/urlpatterns_reverse/views.py
+++ b/tests/urlpatterns_reverse/views.py
@@ -1,10 +1,9 @@
 from functools import partial, update_wrapper
 
+from django.contrib.auth.decorators import user_passes_test
+from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponse
 from django.views.generic import RedirectView
-from django.core.urlresolvers import reverse_lazy
-
-from django.contrib.auth.decorators import user_passes_test
 
 
 def empty_view(request, *args, **kwargs):