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

Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master

8 files changed, 52 insertions, 54 deletions

diff --git a/django/forms/extras/widgets.py b/django/forms/extras/widgets.py
index 0d63b177f7..daf00a6395 100644
--- a/django/forms/extras/widgets.py
+++ b/django/forms/extras/widgets.py
@@ -6,14 +6,13 @@ from __future__ import unicode_literals
 import datetime
 import re
 
-from django.forms.widgets import Widget, Select
-from django.utils import datetime_safe
+from django.conf import settings
+from django.forms.widgets import Select, Widget
+from django.utils import datetime_safe, six
 from django.utils.dates import MONTHS
 from django.utils.encoding import force_str
-from django.utils.safestring import mark_safe
 from django.utils.formats import get_format
-from django.utils import six
-from django.conf import settings
+from django.utils.safestring import mark_safe
 
 __all__ = ('SelectDateWidget',)
 
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 891d8ccd6e..7e50a39432 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -16,27 +16,27 @@ from io import BytesIO
 
 from django.core import validators
 from django.core.exceptions import ValidationError
+# Provide this import for backwards compatibility.
+from django.core.validators import EMPTY_VALUES  # NOQA
 from django.forms.utils import from_current_timezone, to_current_timezone
 from django.forms.widgets import (
-    TextInput, NumberInput, EmailInput, URLInput, HiddenInput,
-    MultipleHiddenInput, ClearableFileInput, CheckboxInput, Select,
-    NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput,
-    SplitDateTimeWidget, SplitHiddenDateTimeWidget, FILE_INPUT_CONTRADICTION
+    FILE_INPUT_CONTRADICTION, CheckboxInput, ClearableFileInput, DateInput,
+    DateTimeInput, EmailInput, HiddenInput, MultipleHiddenInput,
+    NullBooleanSelect, NumberInput, Select, SelectMultiple,
+    SplitDateTimeWidget, SplitHiddenDateTimeWidget, TextInput, TimeInput,
+    URLInput,
 )
-from django.utils import formats
-from django.utils.encoding import smart_text, force_str, force_text
-from django.utils.ipv6 import clean_ipv6_address
+from django.utils import formats, six
 from django.utils.dateparse import parse_duration
-from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning, RenameMethodsBase
+from django.utils.deprecation import (
+    RemovedInDjango19Warning, RemovedInDjango20Warning, RenameMethodsBase,
+)
 from django.utils.duration import duration_string
-from django.utils import six
+from django.utils.encoding import force_str, force_text, smart_text
+from django.utils.ipv6 import clean_ipv6_address
 from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
-# Provide this import for backwards compatibility.
-from django.core.validators import EMPTY_VALUES  # NOQA
-
-
 __all__ = (
     'Field', 'CharField', 'IntegerField',
     'DateField', 'TimeField', 'DateTimeField', 'DurationField',
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 84070d95c6..2d293b2ace 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -4,22 +4,23 @@ Form classes
 
 from __future__ import unicode_literals
 
-from collections import OrderedDict
 import copy
 import datetime
 import warnings
+from collections import OrderedDict
 
-from django.core.exceptions import ValidationError, NON_FIELD_ERRORS
+from django.core.exceptions import NON_FIELD_ERRORS, ValidationError
 from django.forms.fields import Field, FileField
-from django.forms.utils import flatatt, ErrorDict, ErrorList
-from django.forms.widgets import Media, MediaDefiningClass, TextInput, Textarea
+from django.forms.utils import ErrorDict, ErrorList, flatatt
+from django.forms.widgets import Media, MediaDefiningClass, Textarea, TextInput
+from django.utils import six
 from django.utils.deprecation import RemovedInDjango19Warning
-from django.utils.encoding import smart_text, force_text, python_2_unicode_compatible
+from django.utils.encoding import (
+    force_text, python_2_unicode_compatible, smart_text,
+)
 from django.utils.html import conditional_escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
-from django.utils import six
-
 
 __all__ = ('BaseForm', 'Form')
 
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 566269beb5..adacd00fdc 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -2,16 +2,15 @@ from __future__ import unicode_literals
 
 from django.core.exceptions import ValidationError
 from django.forms import Form
-from django.forms.fields import IntegerField, BooleanField
+from django.forms.fields import BooleanField, IntegerField
 from django.forms.utils import ErrorList
 from django.forms.widgets import HiddenInput
+from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
-from django.utils import six
 from django.utils.six.moves import range
-from django.utils.translation import ungettext, ugettext as _
-
+from django.utils.translation import ugettext as _, ungettext
 
 __all__ = ('BaseFormSet', 'formset_factory', 'all_valid')
 
diff --git a/django/forms/models.py b/django/forms/models.py
index b7068e8c75..92906eb1fa 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -5,24 +5,25 @@ and database field objects.
 
 from __future__ import unicode_literals
 
+import warnings
 from collections import OrderedDict
 from itertools import chain
-import warnings
 
 from django.core.exceptions import (
-    ImproperlyConfigured, ValidationError, NON_FIELD_ERRORS, FieldError)
-from django.forms.fields import Field, ChoiceField
-from django.forms.forms import DeclarativeFieldsMetaclass, BaseForm
+    NON_FIELD_ERRORS, FieldError, ImproperlyConfigured, ValidationError,
+)
+from django.forms.fields import ChoiceField, Field
+from django.forms.forms import BaseForm, DeclarativeFieldsMetaclass
 from django.forms.formsets import BaseFormSet, formset_factory
 from django.forms.utils import ErrorList
-from django.forms.widgets import (SelectMultiple, HiddenInput,
-    MultipleHiddenInput)
+from django.forms.widgets import (
+    HiddenInput, MultipleHiddenInput, SelectMultiple,
+)
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango19Warning
-from django.utils.encoding import smart_text, force_text
-from django.utils.text import get_text_list, capfirst
-from django.utils.translation import ugettext_lazy as _, ugettext
-
+from django.utils.encoding import force_text, smart_text
+from django.utils.text import capfirst, get_text_list
+from django.utils.translation import ugettext, ugettext_lazy as _
 
 __all__ = (
     'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model',
diff --git a/django/forms/util.py b/django/forms/util.py
index e093068275..8f7b4ecde5 100644
--- a/django/forms/util.py
+++ b/django/forms/util.py
@@ -6,4 +6,4 @@ warnings.warn(
     "The django.forms.util module has been renamed. "
     "Use django.forms.utils instead.", RemovedInDjango19Warning, stacklevel=2)
 
-from django.forms.utils import *  # NOQA
+from django.forms.utils import *  # NOQA isort:skip
diff --git a/django/forms/utils.py b/django/forms/utils.py
index 19c27f9b8c..73a18622c1 100644
--- a/django/forms/utils.py
+++ b/django/forms/utils.py
@@ -3,21 +3,19 @@ from __future__ import unicode_literals
 import json
 import sys
 
-try:
-    from collections import UserList
-except ImportError:  # Python 2
-    from UserList import UserList
-
 from django.conf import settings
-from django.utils.encoding import force_text, python_2_unicode_compatible
-from django.utils.html import format_html, format_html_join, escape
-from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
-from django.utils import six
-
 # Import ValidationError so that it can be imported from this
 # module to maintain backwards compatibility.
 from django.core.exceptions import ValidationError
+from django.utils import six, timezone
+from django.utils.encoding import force_text, python_2_unicode_compatible
+from django.utils.html import escape, format_html, format_html_join
+from django.utils.translation import ugettext_lazy as _
+
+try:
+    from collections import UserList
+except ImportError:  # Python 2
+    from UserList import UserList
 
 
 def flatatt(attrs):
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index de75b35932..0ed7613d0f 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -9,13 +9,13 @@ from itertools import chain
 
 from django.conf import settings
 from django.forms.utils import flatatt, to_current_timezone
-from django.utils.datastructures import MultiValueDict, MergeDict
+from django.utils import formats, six
+from django.utils.datastructures import MergeDict, MultiValueDict
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.html import conditional_escape, format_html
-from django.utils.translation import ugettext_lazy
 from django.utils.safestring import mark_safe
-from django.utils import formats, six
 from django.utils.six.moves.urllib.parse import urljoin
+from django.utils.translation import ugettext_lazy
 
 __all__ = (
     'Media', 'MediaDefiningClass', 'Widget', 'TextInput',