summaryrefslogtreecommitdiff
path: root/tests/field_subclassing
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-28 07:35:27 -0500
committerTim Graham <timograham@gmail.com>2015-02-06 08:16:28 -0500
commit0ed7d155635da9f79d4dd67e4889087d3673c6da (patch)
treecf5c59b563f01774f32e20b3af8cb24a387fdc4d /tests/field_subclassing
parent388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff)
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/field_subclassing')
-rw-r--r--tests/field_subclassing/fields.py4
-rw-r--r--tests/field_subclassing/models.py5
-rw-r--r--tests/field_subclassing/tests.py2
3 files changed, 4 insertions, 7 deletions
diff --git a/tests/field_subclassing/fields.py b/tests/field_subclassing/fields.py
index b94b2372c1..3bfdb5a89c 100644
--- a/tests/field_subclassing/fields.py
+++ b/tests/field_subclassing/fields.py
@@ -4,11 +4,9 @@ import json
import warnings
from django.db import models
-from django.utils.encoding import force_text
from django.utils import six
from django.utils.deprecation import RemovedInDjango20Warning
-from django.utils.encoding import python_2_unicode_compatible
-
+from django.utils.encoding import force_text, python_2_unicode_compatible
# Catch warning about subfieldbase -- remove in Django 2.0
warnings.filterwarnings(
diff --git a/tests/field_subclassing/models.py b/tests/field_subclassing/models.py
index 66e765ac3e..7ff429c125 100644
--- a/tests/field_subclassing/models.py
+++ b/tests/field_subclassing/models.py
@@ -2,10 +2,9 @@
Tests for field subclassing.
"""
from django.db import models
-from django.utils.encoding import force_text
+from django.utils.encoding import force_text, python_2_unicode_compatible
-from .fields import Small, SmallField, SmallerField, JSONField
-from django.utils.encoding import python_2_unicode_compatible
+from .fields import JSONField, Small, SmallerField, SmallField
@python_2_unicode_compatible
diff --git a/tests/field_subclassing/tests.py b/tests/field_subclassing/tests.py
index 9e40d92496..4d3340260d 100644
--- a/tests/field_subclassing/tests.py
+++ b/tests/field_subclassing/tests.py
@@ -6,7 +6,7 @@ from django.core import exceptions, serializers
from django.db import connection
from django.test import TestCase
-from .fields import Small, CustomTypedField
+from .fields import CustomTypedField, Small
from .models import ChoicesModel, DataModel, MyModel, OtherModel