Merge 19bdb62 into a927523

tox.ini

@@ -33,7 +33,7 @@ deps=
 commands=
     black --check wagtailflags setup.py
     flake8 .
-    isort --check-only --diff --recursive wagtailflags
+    isort --check-only --diff wagtailflags
 
 [flake8]
 ignore=E731,W503,W504
@@ -50,7 +50,6 @@ lines_after_imports=2
 include_trailing_comma=1
 multi_line_output=3
 skip=.tox,migrations
-not_skip=__init__.py
 use_parentheses=1
 known_django=django
 known_wagtail=wagtail

wagtailflags/tests/test_conditions.py

@@ -3,6 +3,7 @@
 from wagtail.core.models import Site
 
 from flags.conditions import RequiredForCondition
+
 from wagtailflags.conditions import site_condition
 
 

wagtailflags/tests/test_templatetags_wagtailflags_admin.py

@@ -1,6 +1,7 @@
 from django.test import TestCase, override_settings
 
 from flags.sources import get_flags
+
 from wagtailflags.templatetags.wagtailflags_admin import disablable, enablable
 
 

wagtailflags/tests/urls.py

@@ -4,8 +4,7 @@
 try:  # pragma: no cover; >= 2.0
     from django.urls import include, re_path
 except ImportError:  # pragma: no cover; fallback for Django < 2.0
-    from django.conf.urls import include
-    from django.conf.urls import url as re_path
+    from django.conf.urls import include, url as re_path
 
 
 urlpatterns = [

wagtailflags/views.py

@@ -4,6 +4,7 @@
 from flags.models import FlagState
 from flags.sources import get_flags
 from flags.templatetags.flags_debug import bool_enabled
+
 from wagtailflags.forms import FlagStateForm, NewFlagForm
 
 

wagtailflags/wagtail_hooks.py

@@ -9,10 +9,9 @@
 
 
 try:  # pragma: no cover; >= 2.0
-    from django.urls import include, reverse, re_path
+    from django.urls import include, re_path, reverse
 except ImportError:  # pragma: no cover; fallback for Django < 2.0
-    from django.conf.urls import include
-    from django.conf.urls import url as re_path
+    from django.conf.urls import include, url as re_path
     from django.core.urlresolvers import reverse