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

Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master

29 files changed, 97 insertions, 82 deletions

diff --git a/django/utils/_os.py b/django/utils/_os.py
index bcfe3de636..679b206e18 100644
--- a/django/utils/_os.py
+++ b/django/utils/_os.py
@@ -2,11 +2,11 @@ import os
 import stat
 import sys
 import tempfile
-from os.path import join, normcase, normpath, abspath, isabs, sep, dirname
+from os.path import abspath, dirname, isabs, join, normcase, normpath, sep
 
 from django.core.exceptions import SuspiciousFileOperation
-from django.utils.encoding import force_text
 from django.utils import six
+from django.utils.encoding import force_text
 
 try:
     WindowsError = WindowsError
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py
index 0fa6ee2855..12f6ba2219 100644
--- a/django/utils/autoreload.py
+++ b/django/utils/autoreload.py
@@ -28,7 +28,8 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import  # Avoid importing `importlib` from this package.
+# Avoid importing `importlib` from this package.
+from __future__ import absolute_import
 
 import os
 import signal
diff --git a/django/utils/cache.py b/django/utils/cache.py
index 365733fedf..e48e159910 100644
--- a/django/utils/cache.py
+++ b/django/utils/cache.py
@@ -24,7 +24,7 @@ import time
 
 from django.conf import settings
 from django.core.cache import caches
-from django.utils.encoding import iri_to_uri, force_bytes, force_text
+from django.utils.encoding import force_bytes, force_text, iri_to_uri
 from django.utils.http import http_date
 from django.utils.timezone import get_current_timezone_name
 from django.utils.translation import get_language
diff --git a/django/utils/crypto.py b/django/utils/crypto.py
index a2a64052b7..1bd0b4d63c 100644
--- a/django/utils/crypto.py
+++ b/django/utils/crypto.py
@@ -3,14 +3,18 @@ Django's standard crypto functions and utilities.
 """
 from __future__ import unicode_literals
 
+import binascii
+import hashlib
 import hmac
+import random
 import struct
-import hashlib
-import binascii
 import time
 
-# Use the system PRNG if possible
-import random
+from django.conf import settings
+from django.utils import six
+from django.utils.encoding import force_bytes
+from django.utils.six.moves import range
+
 try:
     random = random.SystemRandom()
     using_sysrandom = True
@@ -20,11 +24,6 @@ except NotImplementedError:
                   'on your system. Falling back to Mersenne Twister.')
     using_sysrandom = False
 
-from django.conf import settings
-from django.utils.encoding import force_bytes
-from django.utils import six
-from django.utils.six.moves import range
-
 
 def salted_hmac(key_salt, value, secret=None):
     """
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 1640f9ae5a..f4de4e7f7c 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -12,16 +12,18 @@ Usage:
 """
 from __future__ import unicode_literals
 
-import re
-import time
 import calendar
 import datetime
+import re
+import time
 
-from django.utils.dates import MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR
-from django.utils.translation import ugettext as _
-from django.utils.encoding import force_text
 from django.utils import six
+from django.utils.dates import (
+    MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR,
+)
+from django.utils.encoding import force_text
 from django.utils.timezone import get_default_timezone, is_aware, is_naive
+from django.utils.translation import ugettext as _
 
 re_formatchars = re.compile(r'(?<!\\)([aAbBcdDeEfFgGhHiIjlLmMnNoOPrsStTUuwWyYzZ])')
 re_escaped = re.compile(r'\\(.)')
diff --git a/django/utils/dateparse.py b/django/utils/dateparse.py
index 2c749f015c..a3c760e8fb 100644
--- a/django/utils/dateparse.py
+++ b/django/utils/dateparse.py
@@ -7,9 +7,9 @@
 
 import datetime
 import re
-from django.utils import six
-from django.utils.timezone import utc, get_fixed_timezone
 
+from django.utils import six
+from django.utils.timezone import get_fixed_timezone, utc
 
 date_re = re.compile(
     r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$'
diff --git a/django/utils/dates.py b/django/utils/dates.py
index 25f092e618..680415fccb 100644
--- a/django/utils/dates.py
+++ b/django/utils/dates.py
@@ -1,6 +1,6 @@
 "Commonly-used date structures"
 
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 
 WEEKDAYS = {
     0: _('Monday'), 1: _('Tuesday'), 2: _('Wednesday'), 3: _('Thursday'), 4: _('Friday'),
diff --git a/django/utils/datetime_safe.py b/django/utils/datetime_safe.py
index 51cdfe31ef..d2e5b95241 100644
--- a/django/utils/datetime_safe.py
+++ b/django/utils/datetime_safe.py
@@ -7,9 +7,11 @@
 # >>> datetime_safe.date(1850, 8, 2).strftime("%Y/%m/%d was a %A")
 # '1850/08/02 was a Friday'
 
-from datetime import date as real_date, time as real_time, datetime as real_datetime
 import re
 import time as ttime
+from datetime import (
+    date as real_date, datetime as real_datetime, time as real_time,
+)
 
 
 class date(real_date):
diff --git a/django/utils/deconstruct.py b/django/utils/deconstruct.py
index e0713a6d61..a94d242f61 100644
--- a/django/utils/deconstruct.py
+++ b/django/utils/deconstruct.py
@@ -1,4 +1,6 @@
-from __future__ import absolute_import  # Avoid importing `importlib` from this package.
+# Avoid importing `importlib` from this package.
+from __future__ import absolute_import
+
 from importlib import import_module
 
 from django.utils.version import get_docs_version
diff --git a/django/utils/decorators.py b/django/utils/decorators.py
index ba951a9ebc..10ad1ce506 100644
--- a/django/utils/decorators.py
+++ b/django/utils/decorators.py
@@ -5,7 +5,7 @@ try:
 except ImportError:
     ContextDecorator = None
 
-from functools import wraps, update_wrapper, WRAPPER_ASSIGNMENTS
+from functools import WRAPPER_ASSIGNMENTS, update_wrapper, wraps
 
 from django.utils import six
 
diff --git a/django/utils/dictconfig.py b/django/utils/dictconfig.py
index 1644627967..4526ebe721 100644
--- a/django/utils/dictconfig.py
+++ b/django/utils/dictconfig.py
@@ -1,5 +1,10 @@
+import logging.handlers
+import re
+import sys
+import types
 import warnings
 
+from django.utils import six
 from django.utils.deprecation import RemovedInDjango19Warning
 
 warnings.warn("django.utils.dictconfig will be removed in Django 1.9.",
@@ -25,12 +30,7 @@ warnings.warn("django.utils.dictconfig will be removed in Django 1.9.",
 # IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-import logging.handlers
-import re
-import sys
-import types
 
-from django.utils import six
 
 IDENTIFIER = re.compile('^[a-z_][a-z0-9_]*$', re.I)
 
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 40096741a7..99c9da843a 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -3,12 +3,13 @@ from __future__ import unicode_literals
 
 import codecs
 import datetime
-from decimal import Decimal
 import locale
+from decimal import Decimal
 
-from django.utils.functional import Promise
 from django.utils import six
+from django.utils.functional import Promise
 from django.utils.six.moves.urllib.parse import quote, unquote
+
 if six.PY3:
     from urllib.parse import unquote_to_bytes
 
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index 5578ddf46f..d870b50435 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -24,13 +24,13 @@ http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/
 from __future__ import unicode_literals
 
 import datetime
-from django.utils.xmlutils import SimplerXMLGenerator
+
+from django.utils import datetime_safe, six
 from django.utils.encoding import force_text, iri_to_uri
-from django.utils import datetime_safe
-from django.utils import six
 from django.utils.six import StringIO
 from django.utils.six.moves.urllib.parse import urlparse
 from django.utils.timezone import is_aware
+from django.utils.xmlutils import SimplerXMLGenerator
 
 
 def rfc2822_date(date):
diff --git a/django/utils/formats.py b/django/utils/formats.py
index afbe5da12c..30ab3e03eb 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -1,17 +1,19 @@
-from __future__ import absolute_import  # Avoid importing `importlib` from this package.
+# Avoid importing `importlib` from this package.
+from __future__ import absolute_import
 
-import decimal
 import datetime
-from importlib import import_module
+import decimal
 import unicodedata
+from importlib import import_module
 
 from django.conf import settings
-from django.utils import dateformat, numberformat, datetime_safe
+from django.utils import dateformat, datetime_safe, numberformat, six
 from django.utils.encoding import force_str
 from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
-from django.utils import six
-from django.utils.translation import get_language, to_locale, check_for_language
+from django.utils.translation import (
+    check_for_language, get_language, to_locale,
+)
 
 # format_cache is a mapping from (format_type, lang) to the format string.
 # By using the cache, it is possible to avoid running get_format_modules
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 628e02e8d8..e3875a2c51 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -1,8 +1,8 @@
 import copy
 import operator
-from functools import wraps
 import sys
 import warnings
+from functools import wraps
 
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango19Warning
diff --git a/django/utils/html.py b/django/utils/html.py
index a596662d22..1cb09357c2 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -6,17 +6,18 @@ import re
 import sys
 import warnings
 
+from django.utils import six
 from django.utils.deprecation import RemovedInDjango20Warning
-from django.utils.encoding import force_text, force_str
+from django.utils.encoding import force_str, force_text
 from django.utils.functional import allow_lazy
 from django.utils.http import RFC3986_GENDELIMS, RFC3986_SUBDELIMS
 from django.utils.safestring import SafeData, SafeText, mark_safe
-from django.utils import six
-from django.utils.six.moves.urllib.parse import parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit
+from django.utils.six.moves.urllib.parse import (
+    parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit,
+)
 from django.utils.text import normalize_newlines
 
-from .html_parser import HTMLParser, HTMLParseError
-
+from .html_parser import HTMLParseError, HTMLParser
 
 # Configuration for urlize() function.
 TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)', '"', '\'', '!']
diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py
index ab1f654978..616a31f767 100644
--- a/django/utils/html_parser.py
+++ b/django/utils/html_parser.py
@@ -1,7 +1,8 @@
-from django.utils.six.moves import html_parser as _html_parser
 import re
 import sys
 
+from django.utils.six.moves import html_parser as _html_parser
+
 current_version = sys.version_info
 
 use_workaround = (
diff --git a/django/utils/http.py b/django/utils/http.py
index 431f83df21..d732a9c825 100644
--- a/django/utils/http.py
+++ b/django/utils/http.py
@@ -5,17 +5,17 @@ import calendar
 import datetime
 import re
 import sys
-
 from binascii import Error as BinasciiError
 from email.utils import formatdate
 
+from django.utils import six
 from django.utils.datastructures import MultiValueDict
 from django.utils.encoding import force_bytes, force_str, force_text
 from django.utils.functional import allow_lazy
-from django.utils import six
 from django.utils.six.moves.urllib.parse import (
-    quote, quote_plus, unquote, unquote_plus, urlparse,
-    urlencode as original_urlencode)
+    quote, quote_plus, unquote, unquote_plus, urlencode as original_urlencode,
+    urlparse,
+)
 
 ETAG_MATCH = re.compile(r'(?:W/)?"((?:\\.|[^"])*)"')
 
diff --git a/django/utils/importlib.py b/django/utils/importlib.py
index f05638e2e8..fa60db3a48 100644
--- a/django/utils/importlib.py
+++ b/django/utils/importlib.py
@@ -1,11 +1,10 @@
 # Taken from Python 2.7 with permission from/by the original author.
-import warnings
 import sys
+import warnings
 
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango19Warning
 
-
 warnings.warn("django.utils.importlib will be removed in Django 1.9.",
     RemovedInDjango19Warning, stacklevel=2)
 
diff --git a/django/utils/ipv6.py b/django/utils/ipv6.py
index 54ccc73b94..94e9dcf50e 100644
--- a/django/utils/ipv6.py
+++ b/django/utils/ipv6.py
@@ -2,8 +2,8 @@
 # Copyright 2007 Google Inc. http://code.google.com/p/ipaddr-py/
 # Licensed under the Apache License, Version 2.0 (the "License").
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
 from django.utils.six.moves import range
+from django.utils.translation import ugettext_lazy as _
 
 
 def clean_ipv6_address(ip_str, unpack_ipv4=False,
diff --git a/django/utils/jslex.py b/django/utils/jslex.py
index 35bdc57e1a..cfc8654432 100644
--- a/django/utils/jslex.py
+++ b/django/utils/jslex.py
@@ -1,6 +1,7 @@
 """JsLex: a lexer for Javascript"""
 # Originally from https://bitbucket.org/ned/jslex
 from __future__ import unicode_literals
+
 import re
 
 
diff --git a/django/utils/log.py b/django/utils/log.py
index fc350e0b5e..fcff5f3e2a 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -3,6 +3,9 @@ from __future__ import unicode_literals
 import logging
 import sys
 import warnings
+# Imports kept for backwards-compatibility in Django 1.7.
+from logging import NullHandler  # NOQA
+from logging.config import dictConfig  # NOQA
 
 from django.conf import settings
 from django.core import mail
@@ -12,10 +15,6 @@ from django.utils.encoding import force_text
 from django.utils.module_loading import import_string
 from django.views.debug import ExceptionReporter, get_exception_reporter_filter
 
-# Imports kept for backwards-compatibility in Django 1.7.
-from logging import NullHandler  # NOQA
-from logging.config import dictConfig  # NOQA
-
 getLogger = logging.getLogger
 
 # Default logging for Django. This sends an email to the site admins on every
diff --git a/django/utils/module_loading.py b/django/utils/module_loading.py
index cd0c8bc5cc..b94119a3b4 100644
--- a/django/utils/module_loading.py
+++ b/django/utils/module_loading.py
@@ -1,10 +1,11 @@
-from __future__ import absolute_import  # Avoid importing `importlib` from this package.
+# Avoid importing `importlib` from this package.
+from __future__ import absolute_import
 
 import copy
-from importlib import import_module
 import os
 import sys
 import warnings
+from importlib import import_module
 
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import six
diff --git a/django/utils/numberformat.py b/django/utils/numberformat.py
index a70799852d..3f61a6600a 100644
--- a/django/utils/numberformat.py
+++ b/django/utils/numberformat.py
@@ -1,8 +1,8 @@
 from decimal import Decimal
 
 from django.conf import settings
-from django.utils.safestring import mark_safe
 from django.utils import six
+from django.utils.safestring import mark_safe
 
 
 def format(number, decimal_sep, decimal_pos=None, grouping=0, thousand_sep='',
diff --git a/django/utils/safestring.py b/django/utils/safestring.py
index ab4d8149c9..3d3bf1b62a 100644
--- a/django/utils/safestring.py
+++ b/django/utils/safestring.py
@@ -4,8 +4,8 @@ without further escaping in HTML. Marking something as a "safe string" means
 that the producer of the string has already turned characters that should not
 be interpreted by the HTML engine (e.g. '<') into the appropriate entities.
 """
-from django.utils.functional import curry, Promise
 from django.utils import six
+from django.utils.functional import Promise, curry
 
 
 class EscapeData(object):
diff --git a/django/utils/text.py b/django/utils/text.py
index 8446b0a238..eb66b77578 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -2,17 +2,17 @@ from __future__ import unicode_literals
 
 import re
 import unicodedata
+import warnings
 from gzip import GzipFile
 from io import BytesIO
-import warnings
 
+from django.utils import six
 from django.utils.deprecation import RemovedInDjango19Warning
 from django.utils.encoding import force_text
-from django.utils.functional import allow_lazy, SimpleLazyObject
-from django.utils import six
-from django.utils.six.moves import html_entities
-from django.utils.translation import ugettext_lazy, ugettext as _, pgettext
+from django.utils.functional import SimpleLazyObject, allow_lazy
 from django.utils.safestring import SafeText, mark_safe
+from django.utils.six.moves import html_entities
+from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
 
 if six.PY2:
     # Import force_unicode even though this module doesn't use it, because some
diff --git a/django/utils/timezone.py b/django/utils/timezone.py
index a45a72f2f9..dbda90c64a 100644
--- a/django/utils/timezone.py
+++ b/django/utils/timezone.py
@@ -4,20 +4,20 @@ Timezone-related classes and functions.
 This module uses pytz when it's available and fallbacks when it isn't.
 """
 
-from datetime import datetime, timedelta, tzinfo
-from threading import local
 import sys
 import time as _time
+from datetime import datetime, timedelta, tzinfo
+from threading import local
+
+from django.conf import settings
+from django.utils import lru_cache, six
+from django.utils.decorators import ContextDecorator
 
 try:
     import pytz
 except ImportError:
     pytz = None
 
-from django.conf import settings
-from django.utils import lru_cache
-from django.utils import six
-from django.utils.decorators import ContextDecorator
 
 __all__ = [
     'utc', 'get_fixed_timezone',
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 4e6a359df2..a8cc44e835 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -1,13 +1,13 @@
 """Translation helper functions."""
 from __future__ import unicode_literals
 
-from collections import OrderedDict
+import gettext as gettext_module
 import os
 import re
 import sys
-import gettext as gettext_module
-from threading import local
 import warnings
+from collections import OrderedDict
+from threading import local
 
 from django.apps import apps
 from django.conf import settings
@@ -15,13 +15,15 @@ from django.conf.locale import LANG_INFO
 from django.core.exceptions import AppRegistryNotReady
 from django.core.signals import setting_changed
 from django.dispatch import receiver
+from django.utils import lru_cache, six
+from django.utils._os import upath
 from django.utils.deprecation import RemovedInDjango19Warning
 from django.utils.encoding import force_text
-from django.utils._os import upath
-from django.utils.safestring import mark_safe, SafeData
-from django.utils import six, lru_cache
+from django.utils.safestring import SafeData, mark_safe
 from django.utils.six import StringIO
-from django.utils.translation import TranslatorCommentWarning, trim_whitespace, LANGUAGE_SESSION_KEY
+from django.utils.translation import (
+    LANGUAGE_SESSION_KEY, TranslatorCommentWarning, trim_whitespace,
+)
 
 # Translations are cached in a dictionary for every language.
 # The active translations are stored by threadid to make them thread local.
diff --git a/django/utils/tzinfo.py b/django/utils/tzinfo.py
index 25efd20222..6d09082a9e 100644
--- a/django/utils/tzinfo.py
+++ b/django/utils/tzinfo.py
@@ -2,12 +2,14 @@
 
 from __future__ import unicode_literals
 
-from datetime import timedelta, tzinfo
 import time
 import warnings
+from datetime import timedelta, tzinfo
 
 from django.utils.deprecation import RemovedInDjango19Warning
-from django.utils.encoding import force_str, force_text, DEFAULT_LOCALE_ENCODING
+from django.utils.encoding import (
+    DEFAULT_LOCALE_ENCODING, force_str, force_text,
+)
 
 warnings.warn(
     "django.utils.tzinfo will be removed in Django 1.9. "