sorts with isort

src/personalisation/migrations/0025_auto_20161115_1310.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-15 13:10
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/personalisation/migrations/0026_auto_20161117_1201.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.3 on 2016-11-17 11:01
 from __future__ import unicode_literals
 
-from django.db import migrations
 import django.db.models.deletion
 import modelcluster.fields
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

src/personalisation/migrations/0028_referralrule_timerule_visitcountrule.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.3 on 2016-11-18 13:45
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/personalisation/migrations/0029_auto_20161118_1601.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.3 on 2016-11-18 15:01
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/personalisation/migrations/0031_auto_20161130_1224.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.3 on 2016-11-30 11:24
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/personalisation/views.py

@@ -5,7 +5,6 @@ from django.shortcuts import get_object_or_404, render
 from django.utils.translation import ugettext_lazy as _
 from wagtail.contrib.modeladmin.views import CreateView
 
-
 from personalisation.forms import SegmentForm
 from personalisation.models import Segment
 
@@ -39,5 +38,3 @@ class CreateSegmentView(CreateView):
     form_class = SegmentForm
     template_name = 'modeladmin/personalisation/segment/create.html'
     header_icon = 'folder-open-1'
-
-

src/personalisation/wagtail_hooks.py

@@ -6,7 +6,7 @@ from wagtail.contrib.modeladmin.views import IndexView
 from wagtail.wagtailcore import hooks
 
 from personalisation import admin_urls
-from personalisation.models import Segment, PersonalisablePage
+from personalisation.models import PersonalisablePage, Segment
 from personalisation.utils import impersonate_other_page
 
 

tests/conftest.py

@@ -11,4 +11,3 @@ def django_db_setup(django_db_setup, django_db_blocker):
         # Remove some initial data that is brought by the sandbox module
         Site.objects.all().delete()
         Page.objects.all().exclude(depth=1).delete()
-

tests/factories/page.py

@@ -1,9 +1,10 @@
 import factory
 from wagtail.wagtailcore.models import Page
-from personalisation.models import PersonalisablePage
 
+from personalisation.models import PersonalisablePage
 from tests.sandbox.pages.models import HomePage
 
+
 class PersonalisablePageFactory(factory.DjangoModelFactory):
     class Meta:
         model = PersonalisablePage

tests/factories/segment.py

@@ -1,8 +1,10 @@
 import datetime
 
 import factory
+
 from personalisation import models
 
+
 class SegmentFactory(factory.DjangoModelFactory):
     name = 'TestSegment'
     status = 'enabled'

tests/factories/site.py

@@ -3,6 +3,7 @@ from wagtail.wagtailcore.models import Site
 
 from tests.factories.page import SiteRootFactory
 
+
 class SiteFactory(factory.DjangoModelFactory):
     hostname = 'localhost'
     port = 8000

tests/sandbox/pages/models.py

@@ -1,6 +1,7 @@
 from django.db import models
 from wagtail.wagtailadmin.edit_handlers import FieldPanel
 from wagtail.wagtailcore.fields import RichTextField
+
 from personalisation.models import PersonalisablePage
 
 

tests/sandbox/settings/base.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 import os
+
 import django
 
 DATABASES = {

tests/sandbox/urls.py

@@ -7,7 +7,6 @@ from wagtail.wagtailadmin import urls as wagtailadmin_urls
 from wagtail.wagtailcore import urls as wagtail_urls
 from wagtail.wagtaildocs import urls as wagtaildocs_urls
 
-
 urlpatterns = [
     url(r'^django-admin/', include(admin.site.urls)),
 

tests/unit/test_factories.py

@@ -3,7 +3,8 @@ import datetime
 import pytest
 
 from personalisation.models import Segment, TimeRule
-from tests.factories.segment import SegmentFactory, TimeRuleFactory, ReferralRuleFactory
+from tests.factories.segment import (
+    ReferralRuleFactory, SegmentFactory, TimeRuleFactory)
 
 """Factory tests"""
 @pytest.mark.django_db
@@ -38,4 +39,3 @@ def test_create_segment_with_new_referral_rule():
     segment.referral_rule = ReferralRuleFactory(regex_string='test.notest', segment=segment)
 
     assert segment.referral_rule.regex_string == 'test.notest'
-

tests/unit/test_middleware.py

@@ -1,11 +1,13 @@
 import datetime
 
 import pytest
+from django.test.client import Client
 from freezegun import freeze_time
 
-from django.test.client import Client
+from tests.factories.segment import (
+    ReferralRuleFactory, SegmentFactory, TimeRuleFactory)
 from tests.factories.site import SiteFactory
-from tests.factories.segment import SegmentFactory, TimeRuleFactory, ReferralRuleFactory
+
 
 @pytest.mark.django_db
 class TestUserSegmenting(object):

tests/unit/test_models.py

@@ -1,14 +1,13 @@
 import datetime
 
 import pytest
-from freezegun import freeze_time
 from django.http import HttpRequest
+from freezegun import freeze_time
 from wagtail.wagtailcore.models import Site
 
 from personalisation import models
 from tests.factories.site import SiteFactory
 
-
 """Time Rule tests"""
 @freeze_time("10:00:00")
 def test_create_time_rule():
@@ -51,4 +50,3 @@ def test_test(rf):
     request.META['SERVER_PORT'] = 8000
 
     assert Site.find_for_request(request) == site
-