Fix imports with isort

Author: joaojunior

simple_history/models.py

@@ -4,16 +4,18 @@
 import importlib
 import threading
 
-from django.db import models, router
-from django.db.models.fields.proxy import OrderWrt
 from django.conf import settings
 from django.contrib import admin
+from django.db import models, router
+from django.db.models.fields.proxy import OrderWrt
 from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.encoding import smart_text
+from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.timezone import now
 from django.utils.translation import string_concat
 
+from . import exceptions
+from .manager import HistoryDescriptor
+
 try:
     from django.apps import apps
 except ImportError:  # Django < 1.7
@@ -26,8 +28,6 @@
     add_introspection_rules(
         [], ["^simple_history.models.CustomForeignKeyField"])
 
-from . import exceptions
-from .manager import HistoryDescriptor
 
 registered_models = {}
 

simple_history/registry_tests/tests.py

@@ -1,21 +1,21 @@
 from __future__ import unicode_literals
 
-from datetime import datetime, timedelta
-from six.moves import cStringIO as StringIO
 import unittest
+from datetime import datetime, timedelta
 
 import django
 from django.contrib.auth import get_user_model
 from django.core import management
 from django.test import TestCase
-
 from simple_history import exceptions, register
-from ..tests.models import (
-    Poll, Choice, Voter, Restaurant, UserAccessorDefault, UserAccessorOverride,
-    TrackedAbstractBaseA, TrackedAbstractBaseB, TrackedWithAbstractBase,
-    TrackedWithConcreteBase, InheritTracking1, InheritTracking2,
-    InheritTracking3, InheritTracking4,
-)
+from six.moves import cStringIO as StringIO
+
+from ..tests.models import (Choice, InheritTracking1, InheritTracking2,
+                            InheritTracking3, InheritTracking4, Poll,
+                            Restaurant, TrackedAbstractBaseA,
+                            TrackedAbstractBaseB, TrackedWithAbstractBase,
+                            TrackedWithConcreteBase, UserAccessorDefault,
+                            UserAccessorOverride, Voter)
 
 try:
     from django.apps import apps

simple_history/tests/tests/test_models.py

@@ -1,28 +1,27 @@
 from __future__ import unicode_literals
 
-from datetime import datetime, timedelta
 import unittest
 import warnings
+from datetime import datetime, timedelta
 
 import django
 from django.contrib.auth import get_user_model
 from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models.fields.proxy import OrderWrt
 from django.test import TestCase
-
 from simple_history.models import HistoricalRecords, convert_auto_field
 from simple_history.utils import update_change_reason
-from ..models import (
-    AdminProfile, Bookcase, MultiOneToOne, Poll, Choice, Restaurant,
-    Person, FileModel, Document, Book, HistoricalPoll, Library, State,
-    AbstractBase, ConcreteAttr, ConcreteUtil, SelfFK, Temperature, WaterLevel,
-    ExternalModel1, ExternalModel3, UnicodeVerboseName, HistoricalChoice,
-    HistoricalState, HistoricalCustomFKError, Series, SeriesWork, PollInfo,
-    Employee, Country, Province,
-    City, Contact, ContactRegister,
-)
+
 from ..external.models import ExternalModel2, ExternalModel4
+from ..models import (AbstractBase, AdminProfile, Book, Bookcase, Choice, City,
+                      ConcreteAttr, ConcreteUtil, Contact, ContactRegister,
+                      Country, Document, Employee, ExternalModel1,
+                      ExternalModel3, FileModel, HistoricalChoice,
+                      HistoricalCustomFKError, HistoricalPoll, HistoricalState,
+                      Library, MultiOneToOne, Person, Poll, PollInfo, Province,
+                      Restaurant, SelfFK, Series, SeriesWork, State,
+                      Temperature, UnicodeVerboseName, WaterLevel)
 
 try:
     from django.apps import apps