summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-02-02 14:44:07 -0500
committerTim Graham <timograham@gmail.com>2018-02-02 14:44:07 -0500
commitd0a42a14c06e033922f6d51e6384cba53be887b6 (patch)
tree1254746fd276b98103990ad99b056e363cf51e41
parent6a039800db7ce4aa4c1afecd26791c43ddde8920 (diff)
Fixed imports per isort 4.3.1.
Partially reverted 9bcf73d788866bc93f8248cb2e9d601ecbc4b50c.
-rw-r--r--django/contrib/gis/utils/layermapping.py3
-rw-r--r--django/contrib/gis/utils/ogrinspect.py3
-rw-r--r--django/core/handlers/exception.py3
-rw-r--r--django/db/models/fields/related.py3
-rw-r--r--django/db/models/query.py3
-rw-r--r--tests/admin_views/test_actions.py3
-rw-r--r--tests/contenttypes_tests/test_views.py3
-rw-r--r--tests/forms_tests/field_tests/test_charfield.py3
-rw-r--r--tests/modeladmin/tests.py3
-rw-r--r--tests/utils_tests/test_datetime_safe.py3
10 files changed, 20 insertions, 10 deletions
diff --git a/django/contrib/gis/utils/layermapping.py b/django/contrib/gis/utils/layermapping.py
index 2b83df68f6..e4baf56dcb 100644
--- a/django/contrib/gis/utils/layermapping.py
+++ b/django/contrib/gis/utils/layermapping.py
@@ -15,7 +15,8 @@ from django.contrib.gis.gdal import (
SpatialReference,
)
from django.contrib.gis.gdal.field import (
- OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString, OFTTime,
+ OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString,
+ OFTTime,
)
from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist
from django.db import connections, models, router, transaction
diff --git a/django/contrib/gis/utils/ogrinspect.py b/django/contrib/gis/utils/ogrinspect.py
index 4685f33698..9a091602fc 100644
--- a/django/contrib/gis/utils/ogrinspect.py
+++ b/django/contrib/gis/utils/ogrinspect.py
@@ -5,7 +5,8 @@ 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, OFTTime,
+ OFTDate, OFTDateTime, OFTInteger, OFTInteger64, OFTReal, OFTString,
+ OFTTime,
)
diff --git a/django/core/handlers/exception.py b/django/core/handlers/exception.py
index 2827ff6d11..e98bec262a 100644
--- a/django/core/handlers/exception.py
+++ b/django/core/handlers/exception.py
@@ -5,7 +5,8 @@ from functools import wraps
from django.conf import settings
from django.core import signals
from django.core.exceptions import (
- PermissionDenied, RequestDataTooBig, SuspiciousOperation, TooManyFieldsSent,
+ PermissionDenied, RequestDataTooBig, SuspiciousOperation,
+ TooManyFieldsSent,
)
from django.http import Http404
from django.http.multipartparser import MultiPartParserError
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 5397a61e6e..d19d70d30c 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -19,7 +19,8 @@ from . import Field
from .mixins import FieldCacheMixin
from .related_descriptors import (
ForwardManyToOneDescriptor, ForwardOneToOneDescriptor,
- ManyToManyDescriptor, ReverseManyToOneDescriptor, ReverseOneToOneDescriptor,
+ ManyToManyDescriptor, ReverseManyToOneDescriptor,
+ ReverseOneToOneDescriptor,
)
from .related_lookups import (
RelatedExact, RelatedGreaterThan, RelatedGreaterThanOrEqual, RelatedIn,
diff --git a/django/db/models/query.py b/django/db/models/query.py
index b193de5790..44bc51d0e0 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -11,7 +11,8 @@ 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, transaction,
+ DJANGO_VERSION_PICKLE_KEY, IntegrityError, connections, router,
+ transaction,
)
from django.db.models import DateField, DateTimeField, sql
from django.db.models.constants import LOOKUP_SEP
diff --git a/tests/admin_views/test_actions.py b/tests/admin_views/test_actions.py
index 44bff49ec2..b77714b32d 100644
--- a/tests/admin_views/test_actions.py
+++ b/tests/admin_views/test_actions.py
@@ -12,7 +12,8 @@ from django.urls import reverse
from .admin import SubscriberAdmin
from .forms import MediaActionForm
from .models import (
- Actor, Answer, ExternalSubscriber, Question, Subscriber, UnchangeableObject,
+ Actor, Answer, ExternalSubscriber, Question, Subscriber,
+ UnchangeableObject,
)
diff --git a/tests/contenttypes_tests/test_views.py b/tests/contenttypes_tests/test_views.py
index 93ef40b4c2..cdfa1e0961 100644
--- a/tests/contenttypes_tests/test_views.py
+++ b/tests/contenttypes_tests/test_views.py
@@ -8,7 +8,8 @@ from django.test import TestCase, override_settings
from django.test.utils import isolate_apps
from .models import (
- Article, Author, ModelWithNullFKToSite, SchemeIncludedURL, Site as MockSite,
+ Article, Author, ModelWithNullFKToSite, SchemeIncludedURL,
+ Site as MockSite,
)
diff --git a/tests/forms_tests/field_tests/test_charfield.py b/tests/forms_tests/field_tests/test_charfield.py
index e9819268eb..cbacf4d0d7 100644
--- a/tests/forms_tests/field_tests/test_charfield.py
+++ b/tests/forms_tests/field_tests/test_charfield.py
@@ -1,5 +1,6 @@
from django.forms import (
- CharField, HiddenInput, PasswordInput, Textarea, TextInput, ValidationError,
+ CharField, HiddenInput, PasswordInput, Textarea, TextInput,
+ ValidationError,
)
from django.test import SimpleTestCase
diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py
index 4f81036b9a..202929df05 100644
--- a/tests/modeladmin/tests.py
+++ b/tests/modeladmin/tests.py
@@ -3,7 +3,8 @@ 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, get_content_type_for_model,
+ HORIZONTAL, VERTICAL, ModelAdmin, TabularInline,
+ get_content_type_for_model,
)
from django.contrib.admin.sites import AdminSite
from django.contrib.admin.widgets import (
diff --git a/tests/utils_tests/test_datetime_safe.py b/tests/utils_tests/test_datetime_safe.py
index 5b7f6213be..5fa08bc4f4 100644
--- a/tests/utils_tests/test_datetime_safe.py
+++ b/tests/utils_tests/test_datetime_safe.py
@@ -1,6 +1,7 @@
import unittest
from datetime import (
- date as original_date, datetime as original_datetime, time as original_time,
+ date as original_date, datetime as original_datetime,
+ time as original_time,
)
from django.utils.datetime_safe import date, datetime, time