isort and cleaning up

src/personalisation/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.3 on 2016-12-05 07:48
 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/0002_auto_20161205_1623.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.1 on 2016-12-05 16:23
 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/models.py

@@ -1,13 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
-from datetime import datetime
 import re
+from datetime import datetime
 
 from django.db import models
 from django.db.models import Q
-from django.utils import timezone
 from django.db.models.signals import pre_save
 from django.template.defaultfilters import slugify
+from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
@@ -380,4 +380,3 @@ def get_edit_handler(cls):
 
 
 PersonalisablePage.get_edit_handler = get_edit_handler
-

src/personalisation/views.py

@@ -6,7 +6,7 @@ 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, PersonalisablePage
+from personalisation.models import PersonalisablePage, Segment
 
 
 def enable(request, segment_id):
@@ -56,4 +56,3 @@ def copy_page_view(request, page_id, segment_id):
     edit_url = reverse('wagtailadmin_pages:edit', args=[new_page.id])
 
     return HttpResponseRedirect(edit_url)
-

src/personalisation/wagtail_hooks.py

@@ -1,10 +1,9 @@
-import time
 import logging
+import time
 
-
-from django.shortcuts import reverse
 from django.conf.urls import include, url
 from django.core.urlresolvers import reverse
+from django.shortcuts import reverse
 from django.utils.translation import ugettext_lazy as _
 from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
 from wagtail.contrib.modeladmin.views import IndexView
@@ -13,7 +12,8 @@ from wagtail.wagtailadmin.widgets import (
 from wagtail.wagtailcore import hooks
 
 from personalisation import admin_urls
-from personalisation.models import AbstractBaseRule, PersonalisablePage, Segment
+from personalisation.models import (
+    AbstractBaseRule, PersonalisablePage, Segment)
 from personalisation.utils import impersonate_other_page
 
 logger = logging.getLogger()
@@ -198,7 +198,7 @@ def page_listing_more_buttons(page, page_perms, is_parent=False):
     segments = Segment.objects.all()
     current_page = PersonalisablePage.objects.filter(pk=page.pk)
     available_segments = [item for item in segments if not PersonalisablePage.objects.filter(segment=item)]
-    
+
     for segment in available_segments:
         yield Button(segment.name, reverse('segment:copy_page', args=[page.id, segment.id]),
                      attrs={"title": _('Create this variant')})

tests/unit/test_middleware.py

@@ -6,8 +6,8 @@ from freezegun import freeze_time
 from wagtail.wagtailcore.models import Page
 
 from tests.factories.segment import (
-    ReferralRuleFactory, SegmentFactory,
+    QueryRuleFactory, ReferralRuleFactory, SegmentFactory, TimeRuleFactory,
-    TimeRuleFactory, VisitCountRuleFactory, QueryRuleFactory)
+    VisitCountRuleFactory)
 from tests.factories.site import SiteFactory