Sorting imports by isort

demo/demo/forms.py

@@ -1,12 +1,9 @@
-from django import forms
 from crispy_forms.helper import FormHelper
+from django import forms
+
 from django_popup_view_field import PopupViewField
 
-from .popups import (
-    SexPopupView,
-    ColorPopupView,
-    CountryPopupView,
-)
+from .popups import ColorPopupView, CountryPopupView, SexPopupView
 
 
 class DemoForm(forms.Form):

demo/demo/popups.py

@@ -1,11 +1,11 @@
-from django.views.generic import (
-    TemplateView,
-    FormView,
-)
+from string import ascii_uppercase
+
+from django import forms
 from django.http import HttpResponse
+from django.views.generic import FormView, TemplateView
+
 from django_popup_view_field.registry import registry_popup_view
-from django import forms
-from string import ascii_uppercase
+
 from .models import Country
 
 

demo/demo/urls.py

@@ -1,5 +1,6 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 from django.contrib import admin
+
 from .views import Index
 
 urlpatterns = [

demo/demo/views.py

@@ -1,5 +1,6 @@
-from django.views.generic import TemplateView
 from django.http import HttpResponse
+from django.views.generic import TemplateView
+
 from .forms import DemoForm
 
 

django_popup_view_field/fields.py

@@ -1,8 +1,9 @@
 from django.forms.fields import CharField
-from django.views.generic import View
 from django.utils.translation import ugettext_lazy as _
-from .widgets import PopupViewWidget
+from django.views.generic import View
+
 from .exceptions import PopupViewIsNotSubclassView
+from .widgets import PopupViewWidget
 
 
 class PopupViewField(CharField):

django_popup_view_field/registry.py

@@ -1,8 +1,9 @@
 from django.views.generic import View
+
 from .exceptions import (
     PopupViewAlreadyRegistered,
-    PopupViewNotRegistered,
     PopupViewIsNotSubclassView,
+    PopupViewNotRegistered,
 )
 
 

django_popup_view_field/templatetags/django_popup_view_field_tags.py

@@ -1,10 +1,5 @@
+from django.template import Context, Library, loader
 from django.utils.safestring import mark_safe
-from django.template import (
-    loader,
-    Library,
-    Context
-)
-
 
 register = Library()
 

django_popup_view_field/tests/forms.py

@@ -1,6 +1,8 @@
 # encoding: utf-8
-from django_popup_view_field.fields import PopupViewField
 from django import forms
+
+from django_popup_view_field.fields import PopupViewField
+
 from .popups import PopupView1
 
 

django_popup_view_field/tests/popups.py

@@ -1,5 +1,6 @@
 # encoding: utf-8
 from django.views.generic import TemplateView
+
 from django_popup_view_field.registry import registry_popup_view
 
 

django_popup_view_field/tests/test_field.py

@@ -1,12 +1,10 @@
 # encoding: utf-8
-from django.test import TestCase
-from django_popup_view_field.fields import PopupViewField
+from django import VERSION, forms
 from django.forms.fields import CharField
+from django.test import TestCase
 from django.views.generic import View
-from django import (
-    forms,
-    VERSION,
-)
+
+from django_popup_view_field.fields import PopupViewField
 
 
 class FieldTest(TestCase):

django_popup_view_field/tests/test_registry.py

@@ -1,13 +1,13 @@
 # encoding: utf-8
-from django_popup_view_field.registry import registry_popup_view
-from django.views.generic import View
 from django.test import TestCase
+from django.views.generic import View
 
 from django_popup_view_field.exceptions import (
-    PopupViewIsNotSubclassView,
     PopupViewAlreadyRegistered,
+    PopupViewIsNotSubclassView,
     PopupViewNotRegistered,
 )
+from django_popup_view_field.registry import registry_popup_view
 
 
 class RegistryTest(TestCase):

django_popup_view_field/tests/test_templatetags.py

@@ -1,9 +1,6 @@
 # encoding: utf-8
+from django.template import Context, engines
 from django.test import TestCase
-from django.template import (
-    engines,
-    Context
-)
 
 
 class TemplatetagsTest(TestCase):

django_popup_view_field/tests/test_views.py

@@ -1,10 +1,6 @@
 # encoding: utf-8
 import django
-
-from django.test import (
-    TestCase,
-    Client,
-)
+from django.test import Client, TestCase
 
 if django.VERSION < (1, 10):
     from django.core.urlresolvers import reverse

django_popup_view_field/tests/urls.py

@@ -1,9 +1,7 @@
 # encoding: utf-8
-from django.conf.urls import url, include
-from .views import (
-    View1,
-)
+from django.conf.urls import include, url
 
+from .views import View1
 
 urlpatterns = [
 

django_popup_view_field/tests/views.py

@@ -1,6 +1,7 @@
 # encoding: utf-8
-from django.views.generic import FormView
 from django.http import HttpResponse
+from django.views.generic import FormView
+
 from .forms import Form1
 
 

django_popup_view_field/urls.py

@@ -1,4 +1,6 @@
+from django import VERSION
 from django.conf.urls import url
+
 from .views import GetPopupView
 
 """
@@ -7,7 +9,6 @@
 and for django >= 1.10 I use view class
 """
 
-from django import VERSION
 if VERSION < (1, 10):
     from django.views.i18n import javascript_catalog
 else:

django_popup_view_field/views.py

@@ -1,5 +1,6 @@
-from django.views.generic import View
 from django.http import Http404
+from django.views.generic import View
+
 from .registry import registry_popup_view
 
 

django_popup_view_field/widgets.py

@@ -1,8 +1,8 @@
 from django import forms
+from django.core.urlresolvers import reverse
 from django.forms.utils import flatatt
-from django.utils.html import format_html
 from django.utils.encoding import force_text
-from django.core.urlresolvers import reverse
+from django.utils.html import format_html
 
 
 class PopupViewWidget(forms.TextInput):

run_test.py

@@ -7,7 +7,6 @@
 from django.conf import settings
 from django.test.utils import get_runner
 
-
 if __name__ == "__main__":
     '''
     Test for project, go to test app directory and set settings

tox.ini

@@ -4,7 +4,8 @@ envlist=
     {py27,py34}-dj_1.8-bootstrap_7.0.0-crispy_{1.5.0,1.5.1}-tests,
     {py27,py34}-dj_1.9-bootstrap_{7.1.0,7.0.0}-crispy_{1.6.0,1.6.1}-tests,
     {py27,py34}-dj_1.10-bootstrap_{7.1.0,7.0.0}-crispy_{1.6.1,1.6.1}-tests,
-    {py27,py34}-flake
+    {py27,py34}-flake,
+    py34-isort
 
 [testenv]
 basepython =
@@ -28,4 +29,4 @@ deps =
 commands =
     tests: ./run_test.py
     flake: flake8
-    isort: isort -rc -w80 -m3 -tc -c -df django_popup_view_field runtests.py
+    isort: isort -rc -w80 -m3 -tc -c -df django_popup_view_field run_test.py