Sorted imports with isort; refs #23860.

12 files changed, 39 insertions, 49 deletions

diff --git a/tests/i18n/contenttypes/tests.py b/tests/i18n/contenttypes/tests.py
index a93f2030f2..890fa1156b 100644
--- a/tests/i18n/contenttypes/tests.py
+++ b/tests/i18n/contenttypes/tests.py
@@ -5,9 +5,8 @@ import os
 
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase, override_settings
+from django.utils import six, translation
 from django.utils._os import upath
-from django.utils import six
-from django.utils import translation
 
 
 @override_settings(
diff --git a/tests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py
index f96ac82fc4..1ac0e8a4a9 100644
--- a/tests/i18n/patterns/tests.py
+++ b/tests/i18n/patterns/tests.py
@@ -3,13 +3,15 @@ from __future__ import unicode_literals
 import os
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse, clear_url_caches, set_script_prefix
+from django.core.urlresolvers import (
+    clear_url_caches, reverse, set_script_prefix,
+)
 from django.http import HttpResponsePermanentRedirect
 from django.middleware.locale import LocaleMiddleware
+from django.template import Context, Template
 from django.test import TestCase, override_settings
-from django.template import Template, Context
-from django.utils._os import upath
 from django.utils import translation
+from django.utils._os import upath
 
 
 class PermanentRedirectLocaleMiddleWare(LocaleMiddleware):
diff --git a/tests/i18n/patterns/urls/default.py b/tests/i18n/patterns/urls/default.py
index 416c4e854f..caf1a7637d 100644
--- a/tests/i18n/patterns/urls/default.py
+++ b/tests/i18n/patterns/urls/default.py
@@ -3,7 +3,6 @@ from django.conf.urls.i18n import i18n_patterns
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView
 
-
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
diff --git a/tests/i18n/patterns/urls/included.py b/tests/i18n/patterns/urls/included.py
index eb4631c087..ded29a8bf1 100644
--- a/tests/i18n/patterns/urls/included.py
+++ b/tests/i18n/patterns/urls/included.py
@@ -1,7 +1,6 @@
 from django.conf.urls import url
 from django.views.generic import TemplateView
 
-
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
diff --git a/tests/i18n/patterns/urls/namespace.py b/tests/i18n/patterns/urls/namespace.py
index 570a7572e6..6060c57bd6 100644
--- a/tests/i18n/patterns/urls/namespace.py
+++ b/tests/i18n/patterns/urls/namespace.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView
 
-
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
diff --git a/tests/i18n/patterns/urls/path_unused.py b/tests/i18n/patterns/urls/path_unused.py
index cd17527bf0..e2186d3d02 100644
--- a/tests/i18n/patterns/urls/path_unused.py
+++ b/tests/i18n/patterns/urls/path_unused.py
@@ -1,7 +1,6 @@
 from django.conf.urls import url
 from django.views.generic import TemplateView
 
-
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = [
diff --git a/tests/i18n/patterns/urls/wrong.py b/tests/i18n/patterns/urls/wrong.py
index fe948e0563..a8f9410db8 100644
--- a/tests/i18n/patterns/urls/wrong.py
+++ b/tests/i18n/patterns/urls/wrong.py
@@ -2,7 +2,6 @@ from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.utils.translation import ugettext_lazy as _
 
-
 urlpatterns = i18n_patterns(
     url(_(r'^account/'), include('i18n.patterns.urls.wrong_namespace', namespace='account')),
 )
diff --git a/tests/i18n/patterns/urls/wrong_namespace.py b/tests/i18n/patterns/urls/wrong_namespace.py
index f3b55b69fe..e19c99c935 100644
--- a/tests/i18n/patterns/urls/wrong_namespace.py
+++ b/tests/i18n/patterns/urls/wrong_namespace.py
@@ -3,7 +3,6 @@ from django.conf.urls.i18n import i18n_patterns
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView
 
-
 view = TemplateView.as_view(template_name='dummy.html')
 
 urlpatterns = i18n_patterns(
diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py
index c17db0a98a..682885bec8 100644
--- a/tests/i18n/test_compilation.py
+++ b/tests/i18n/test_compilation.py
@@ -1,21 +1,22 @@
 # -*- coding: utf-8 -*-
 
+import gettext as gettext_module
 import os
 import shutil
 import stat
 import unittest
-import gettext as gettext_module
 
-from django.core.management import call_command, CommandError, execute_from_command_line
+from django.core.management import (
+    CommandError, call_command, execute_from_command_line,
+)
 from django.core.management.utils import find_command
-from django.test import SimpleTestCase
-from django.test import override_settings
+from django.test import SimpleTestCase, override_settings
 from django.test.utils import captured_stderr, captured_stdout
 from django.utils import translation
-from django.utils.translation import ugettext
-from django.utils.encoding import force_text
 from django.utils._os import upath
+from django.utils.encoding import force_text
 from django.utils.six import StringIO
+from django.utils.translation import ugettext
 
 has_msgfmt = find_command('msgfmt')
 
diff --git a/tests/i18n/test_extraction.py b/tests/i18n/test_extraction.py
index 99d4983b43..556cba7fa4 100644
--- a/tests/i18n/test_extraction.py
+++ b/tests/i18n/test_extraction.py
@@ -6,24 +6,24 @@ import os
 import re
 import shutil
 import time
-from unittest import SkipTest, skipUnless
 import warnings
+from unittest import SkipTest, skipUnless
 
 from django.conf import settings
 from django.core import management
 from django.core.management import execute_from_command_line
 from django.core.management.base import CommandError
-from django.core.management.commands.makemessages import Command as MakeMessagesCommand
+from django.core.management.commands.makemessages import \
+    Command as MakeMessagesCommand
 from django.core.management.utils import find_command
-from django.test import mock, override_settings, SimpleTestCase
+from django.test import SimpleTestCase, mock, override_settings
 from django.test.utils import captured_stderr, captured_stdout
-from django.utils.encoding import force_text
-from django.utils._os import upath
 from django.utils import six
+from django.utils._os import upath
+from django.utils.encoding import force_text
 from django.utils.six import StringIO
 from django.utils.translation import TranslatorCommentWarning
 
-
 LOCALE = 'de'
 has_xgettext = find_command('xgettext')
 this_directory = os.path.dirname(upath(__file__))
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index cbc31828b4..b9a2858148 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -1,45 +1,40 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
-from contextlib import contextmanager
 import datetime
 import decimal
 import gettext as gettext_module
-from importlib import import_module
 import os
 import pickle
+from contextlib import contextmanager
+from importlib import import_module
 from threading import local
 from unittest import skipUnless
 
 from django import forms
 from django.conf import settings
-from django.template import Template, Context
+from django.template import Context, Template
 from django.template.base import TemplateSyntaxError
-from django.test import TestCase, RequestFactory, override_settings
-from django.utils import translation
-from django.utils.formats import (get_format, date_format, time_format,
-    localize, localize_input, iter_format_modules, get_format_modules,
-    reset_format_cache, sanitize_separators)
-from django.utils.numberformat import format as nformat
+from django.test import RequestFactory, TestCase, override_settings
+from django.utils import six, translation
 from django.utils._os import upath
-from django.utils.safestring import mark_safe, SafeBytes, SafeString, SafeText
-from django.utils import six
+from django.utils.formats import (
+    date_format, get_format, get_format_modules, iter_format_modules, localize,
+    localize_input, reset_format_cache, sanitize_separators, time_format,
+)
+from django.utils.numberformat import format as nformat
+from django.utils.safestring import SafeBytes, SafeString, SafeText, mark_safe
 from django.utils.six import PY3
-from django.utils.translation import (activate, deactivate,
-    get_language, get_language_from_request, get_language_info,
-    to_locale, trans_real,
-    gettext, gettext_lazy,
-    ugettext, ugettext_lazy,
-    ngettext_lazy,
-    ungettext_lazy,
-    pgettext, pgettext_lazy,
-    npgettext, npgettext_lazy,
-    check_for_language,
-    string_concat, LANGUAGE_SESSION_KEY)
-
-from .forms import I18nForm, SelectDateForm, CompanyForm
-from .models import Company, TestModel
+from django.utils.translation import (
+    LANGUAGE_SESSION_KEY, activate, check_for_language, deactivate,
+    get_language, get_language_from_request, get_language_info, gettext,
+    gettext_lazy, ngettext_lazy, npgettext, npgettext_lazy, pgettext,
+    pgettext_lazy, string_concat, to_locale, trans_real, ugettext,
+    ugettext_lazy, ungettext_lazy,
+)
 
+from .forms import CompanyForm, I18nForm, SelectDateForm
+from .models import Company, TestModel
 
 here = os.path.dirname(os.path.abspath(upath(__file__)))
 extended_locale_paths = settings.LOCALE_PATHS + [
diff --git a/tests/i18n/urls.py b/tests/i18n/urls.py
index c1124a1b8c..d63499f1bb 100644
--- a/tests/i18n/urls.py
+++ b/tests/i18n/urls.py
@@ -6,7 +6,6 @@ from django.test import ignore_warnings
 from django.utils.deprecation import RemovedInDjango20Warning
 from django.utils.translation import ugettext_lazy as _
 
-
 # test deprecated version of i18n_patterns() function (with prefix). Remove it
 # and convert to list of urls() in Django 2.0
 i18n_patterns = ignore_warnings(category=RemovedInDjango20Warning)(i18n_patterns)