docstring fixes and isort

src/personalisation/forms.py

@@ -1,14 +1,12 @@
 from __future__ import absolute_import, unicode_literals
 
 from django import forms
-from django.conf import settings
 from django.utils.translation import ugettext as _
+from wagtail.wagtailadmin.forms import WagtailAdminModelForm
 from wagtail.wagtailcore.models import Page
 
-from wagtail.wagtailadmin.forms import WagtailAdminModelForm
-
 from personalisation.models import (
-    ReferralRule, Segment, TimeRule, VisitCountRule, PersonalisablePage)
+    PersonalisablePage, ReferralRule, Segment, TimeRule, VisitCountRule)
 
 
 class SegmentForm(forms.ModelForm):
@@ -47,6 +45,7 @@ class VisitCountRuleForm(WagtailAdminModelForm):
 
 
 class PersonalisationForm(forms.Form):
+    """Form to add new personalisation pages"""
     copy_from_canonical = forms.BooleanField(required=False)
     parent_page = forms.ModelChoiceField(
         queryset=PersonalisablePage.objects.all()

src/personalisation/middleware.py

@@ -1,9 +1,10 @@
-import time
 import logging
+import time
+
+from personalisation.models import AbstractBaseRule, Segment
 
 logger = logging.getLogger()
 
-from personalisation.models import AbstractBaseRule, Segment
 
 
 class SegmentMiddleware(object):

src/personalisation/migrations/0006_abstractbaserule_polymorphic_ctype.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-08 13:00
 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/0006_visitcountrule.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-08 14:47
 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/0016_auto_20161109_1255.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-09 11:55
 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/0017_auto_20161109_1435.py

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

src/personalisation/migrations/0021_auto_20161110_1325.py

@@ -2,9 +2,9 @@
 # Generated by Django 1.10.3 on 2016-11-10 12:25
 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/0022_visitcountrule_counted_page.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-10 12:39
 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/0023_auto_20161110_1454.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-10 13:54
 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/0024_personalisablepage.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.10.3 on 2016-11-14 12:14
 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/models.py

@@ -11,15 +11,14 @@ from django.template.defaultfilters import slugify
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
-from modelcluster.models import ClusterableModel
 from modelcluster.fields import ParentalKey
+from modelcluster.models import ClusterableModel
+from polymorphic.models import PolymorphicModel
+from wagtail.utils.decorators import cached_classmethod
 from wagtail.wagtailadmin.edit_handlers import (
     FieldPanel, MultiFieldPanel, ObjectList, PageChooserPanel, TabbedInterface)
 from wagtail.wagtailadmin.forms import WagtailAdminPageForm
 from wagtail.wagtailcore.models import Page
-from wagtail.utils.decorators import cached_classmethod
-
-from polymorphic.models import PolymorphicModel
 
 from personalisation.edit_handlers import ReadOnlyWidget
 

src/personalisation/views.py

@@ -7,10 +7,10 @@ from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from wagtail.contrib.modeladmin.views import CreateView
 
-from personalisation.forms import (ReferralRuleForm, SegmentForm, TimeRuleForm,
+from personalisation.forms import (
-                                   VisitCountRuleForm)
+    ReferralRuleForm, SegmentForm, TimeRuleForm, VisitCountRuleForm)
-from personalisation.models import (ReferralRule, Segment, TimeRule,
+from personalisation.models import (
-                                    VisitCountRule)
+    ReferralRule, Segment, TimeRule, VisitCountRule)
 
 
 def overview(request):
@@ -34,7 +34,7 @@ def disable(request, segment_id):
     return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
 # TODO: Make these requestable from an existing page (the create page.)
-# This code might become obselete.
+# This code might become obsolete.
 
 def time_rule_embed(request):
     """Show the content of the time rule modal."""

src/personalisation/wagtail_hooks.py

@@ -6,8 +6,8 @@ from wagtail.contrib.modeladmin.views import CreateView
 from wagtail.wagtailcore import hooks
 
 from personalisation import admin_urls
-from personalisation.forms import (ReferralRuleForm, TimeRuleForm,
+from personalisation.forms import (
-                                   VisitCountRuleForm)
+    ReferralRuleForm, TimeRuleForm, VisitCountRuleForm)
 from personalisation.models import Segment
 
 

tests/test_models.py

@@ -1,6 +1,7 @@
 import datetime
 
 import pytest
+
 from personalisation.models import TimeRule