Fixed imports per isort 4.3.0.

django/contrib/gis/utils/layermapping.py

@@ -15,8 +15,7 @@ from django.contrib.gis.gdal import (
     SpatialReference,
 )
 from django.contrib.gis.gdal.field import (
-    OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString,
+    OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString, OFTTime,
-    OFTTime,
 )
 from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist
 from django.db import connections, models, router, transaction

django/contrib/gis/utils/ogrinspect.py

@@ -5,8 +5,7 @@ models for GeoDjango and/or mapping dictionaries for use with the
 """
 from django.contrib.gis.gdal import DataSource
 from django.contrib.gis.gdal.field import (
-    OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString,
+    OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString, OFTTime,
-    OFTTime,
 )
 
 

django/contrib/messages/__init__.py

@@ -1,5 +1,4 @@
 from django.contrib.messages.api import *  # NOQA
 from django.contrib.messages.constants import *  # NOQA
 
-
 default_app_config = 'django.contrib.messages.apps.MessagesConfig'

django/core/handlers/exception.py

@@ -5,8 +5,7 @@ from functools import wraps
 from django.conf import settings
 from django.core import signals
 from django.core.exceptions import (
-    PermissionDenied, RequestDataTooBig, SuspiciousOperation,
+    PermissionDenied, RequestDataTooBig, SuspiciousOperation, TooManyFieldsSent,
-    TooManyFieldsSent,
 )
 from django.http import Http404
 from django.http.multipartparser import MultiPartParserError

django/core/management/commands/runserver.py

@@ -12,7 +12,6 @@ from django.core.servers.basehttp import (
 )
 from django.utils import autoreload
 
-
 naiveip_re = re.compile(r"""^(?:
 (?P<addr>
     (?P<ipv4>\d{1,3}(?:\.\d{1,3}){3}) |         # IPv4 address

django/db/models/fields/related.py

@@ -19,8 +19,7 @@ from . import Field
 from .mixins import FieldCacheMixin
 from .related_descriptors import (
     ForwardManyToOneDescriptor, ForwardOneToOneDescriptor,
-    ManyToManyDescriptor, ReverseManyToOneDescriptor,
+    ManyToManyDescriptor, ReverseManyToOneDescriptor, ReverseOneToOneDescriptor,
-    ReverseOneToOneDescriptor,
 )
 from .related_lookups import (
     RelatedExact, RelatedGreaterThan, RelatedGreaterThanOrEqual, RelatedIn,

django/db/models/query.py

@@ -11,8 +11,7 @@ from functools import lru_cache
 from django.conf import settings
 from django.core import exceptions
 from django.db import (
-    DJANGO_VERSION_PICKLE_KEY, IntegrityError, connections, router,
+    DJANGO_VERSION_PICKLE_KEY, IntegrityError, connections, router, transaction,
-    transaction,
 )
 from django.db.models import DateField, DateTimeField, sql
 from django.db.models.constants import LOOKUP_SEP

django/db/models/signals.py

@@ -3,7 +3,6 @@ from functools import partial
 from django.db.models.utils import make_model_tuple
 from django.dispatch import Signal
 
-
 class_prepared = Signal(providing_args=["class"])
 
 

tests/admin_views/test_actions.py

@@ -12,8 +12,7 @@ from django.urls import reverse
 from .admin import SubscriberAdmin
 from .forms import MediaActionForm
 from .models import (
-    Actor, Answer, ExternalSubscriber, Question, Subscriber,
+    Actor, Answer, ExternalSubscriber, Question, Subscriber, UnchangeableObject,
-    UnchangeableObject,
 )
 
 

tests/contenttypes_tests/test_views.py

@@ -8,8 +8,7 @@ from django.test import TestCase, override_settings
 from django.test.utils import isolate_apps
 
 from .models import (
-    Article, Author, ModelWithNullFKToSite, SchemeIncludedURL,
+    Article, Author, ModelWithNullFKToSite, SchemeIncludedURL, Site as MockSite,
-    Site as MockSite,
 )
 
 

tests/db_functions/tests.py

@@ -14,7 +14,6 @@ from django.utils import timezone
 
 from .models import Article, Author, DecimalModel, Fan
 
-
 lorem_ipsum = """
     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
     tempor incididunt ut labore et dolore magna aliqua."""

tests/forms_tests/field_tests/test_charfield.py

@@ -1,6 +1,5 @@
 from django.forms import (
-    CharField, HiddenInput, PasswordInput, Textarea, TextInput,
+    CharField, HiddenInput, PasswordInput, Textarea, TextInput, ValidationError,
-    ValidationError,
 )
 from django.test import SimpleTestCase
 

tests/messages_tests/urls.py

@@ -9,7 +9,6 @@ from django.urls import reverse
 from django.views.decorators.cache import never_cache
 from django.views.generic.edit import FormView
 
-
 TEMPLATE = """{% if messages %}
 <ul class="messages">
     {% for message in messages %}

tests/modeladmin/tests.py

@@ -3,8 +3,7 @@ from datetime import date
 from django import forms
 from django.contrib.admin.models import ADDITION, CHANGE, DELETION, LogEntry
 from django.contrib.admin.options import (
-    HORIZONTAL, VERTICAL, ModelAdmin, TabularInline,
+    HORIZONTAL, VERTICAL, ModelAdmin, TabularInline, get_content_type_for_model,
-    get_content_type_for_model,
 )
 from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.widgets import (

tests/template_tests/syntax_tests/test_multiline.py

@@ -2,7 +2,6 @@ from django.test import SimpleTestCase
 
 from ..utils import setup
 
-
 multiline_string = """
 Hello,
 boys.

tests/urlpatterns_reverse/tests.py

@@ -534,9 +534,10 @@ class ReverseLazySettingsTest(AdminScriptTestCase):
     import error.
     """
     def setUp(self):
-        self.write_settings('settings.py', extra="""
+        self.write_settings(
-from django.urls import reverse_lazy
+            'settings.py',
-LOGIN_URL = reverse_lazy('login')""")
+            extra="from django.urls import reverse_lazy\nLOGIN_URL = reverse_lazy('login')",
+        )
 
     def tearDown(self):
         self.remove_settings('settings.py')

tests/utils_tests/test_datetime_safe.py

@@ -1,7 +1,6 @@
 import unittest
 from datetime import (
-    date as original_date, datetime as original_datetime,
+    date as original_date, datetime as original_datetime, time as original_time,
-    time as original_time,
 )
 
 from django.utils.datetime_safe import date, datetime, time