housekeeping: sort imports (#761)

housekeeping: sort imports

django_filters/conf.py

@@ -8,7 +8,6 @@
 from .constants import STRICTNESS
 from .utils import deprecate
 
-
 DEFAULTS = {
     'DISABLE_HELP_TEXT': False,
     'HELP_TEXT_FILTER': True,

django_filters/fields.py

@@ -1,17 +1,15 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from datetime import datetime, time
 from collections import namedtuple
+from datetime import datetime, time
 
 from django import forms
 from django.utils.dateparse import parse_datetime
-
 from django.utils.encoding import force_str
 from django.utils.translation import ugettext_lazy as _
 
 from .utils import handle_timezone
-from .widgets import RangeWidget, LookupTypeWidget, CSVWidget, BaseCSVWidget
+from .widgets import BaseCSVWidget, CSVWidget, LookupTypeWidget, RangeWidget
 
 
 class RangeField(forms.MultiValueField):

django_filters/filters.py

@@ -1,13 +1,12 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from collections import OrderedDict
 from datetime import timedelta
 
 from django import forms
 from django.db.models import Q
-from django.db.models.sql.constants import QUERY_TERMS
 from django.db.models.constants import LOOKUP_SEP
+from django.db.models.sql.constants import QUERY_TERMS
 from django.utils import six
 from django.utils.itercompat import is_iterable
 from django.utils.timezone import now
@@ -17,12 +16,18 @@
 from .conf import settings
 from .constants import EMPTY_VALUES
 from .fields import (
-    Lookup, LookupTypeField, BaseCSVField, BaseRangeField, RangeField,
-    DateRangeField, DateTimeRangeField, TimeRangeField, IsoDateTimeField
+    BaseCSVField,
+    BaseRangeField,
+    DateRangeField,
+    DateTimeRangeField,
+    IsoDateTimeField,
+    Lookup,
+    LookupTypeField,
+    RangeField,
+    TimeRangeField
 )
 from .utils import label_for_filter
 
-
 __all__ = [
     'AllValuesFilter',
     'AllValuesMultipleFilter',

django_filters/filterset.py

@@ -1,5 +1,4 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import copy
 from collections import OrderedDict
@@ -10,13 +9,31 @@
 from django.db.models.fields.related import ForeignObjectRel
 from django.utils import six
 
-from .conf import settings
 from .compat import remote_field, remote_queryset
-from .constants import ALL_FIELDS, STRICTNESS, EMPTY_VALUES
-from .filters import (Filter, CharFilter, BooleanFilter, BaseInFilter, BaseRangeFilter,
-                      ChoiceFilter, DateFilter, DateTimeFilter, TimeFilter, ModelChoiceFilter,
-                      ModelMultipleChoiceFilter, NumberFilter, UUIDFilter, DurationFilter)
-from .utils import try_dbfield, get_all_model_fields, get_model_field, resolve_field
+from .conf import settings
+from .constants import ALL_FIELDS, EMPTY_VALUES, STRICTNESS
+from .filters import (
+    BaseInFilter,
+    BaseRangeFilter,
+    BooleanFilter,
+    CharFilter,
+    ChoiceFilter,
+    DateFilter,
+    DateTimeFilter,
+    DurationFilter,
+    Filter,
+    ModelChoiceFilter,
+    ModelMultipleChoiceFilter,
+    NumberFilter,
+    TimeFilter,
+    UUIDFilter
+)
+from .utils import (
+    get_all_model_fields,
+    get_model_field,
+    resolve_field,
+    try_dbfield
+)
 
 
 def get_filter_name(field_name, lookup_expr):

django_filters/rest_framework/backends.py

@@ -1,12 +1,13 @@
 
 from __future__ import absolute_import
+
 import warnings
 
 from django.template import loader
 from django.utils import six
 
+from . import filters, filterset
 from .. import compat
-from . import filterset, filters
 
 
 class DjangoFilterBackend(object):

django_filters/rest_framework/filterset.py

@@ -1,15 +1,15 @@
 
 from __future__ import absolute_import
+
 from copy import deepcopy
 
-from django.db import models
 from django import forms
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
-
 from django_filters import filterset
-from .filters import BooleanFilter, IsoDateTimeFilter
-from .. import compat, utils
 
+from .. import compat, utils
+from .filters import BooleanFilter, IsoDateTimeFilter
 
 FILTER_FOR_DBFIELD_DEFAULTS = deepcopy(filterset.FILTER_FOR_DBFIELD_DEFAULTS)
 FILTER_FOR_DBFIELD_DEFAULTS.update({

django_filters/utils.py

@@ -1,13 +1,13 @@
-import django
 import warnings
 
+import django
 from django.conf import settings
 from django.core.exceptions import FieldError
 from django.db import models
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.expressions import Expression
 from django.db.models.fields import FieldDoesNotExist
-from django.db.models.fields.related import RelatedField, ForeignObjectRel
+from django.db.models.fields.related import ForeignObjectRel, RelatedField
 from django.forms import ValidationError
 from django.utils import six, timezone
 from django.utils.encoding import force_text

django_filters/views.py

@@ -1,11 +1,14 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
+
 from django.core.exceptions import ImproperlyConfigured
 from django.views.generic import View
-from django.views.generic.list import MultipleObjectMixin
-from django.views.generic.list import MultipleObjectTemplateResponseMixin
-from .filterset import filterset_factory
+from django.views.generic.list import (
+    MultipleObjectMixin,
+    MultipleObjectTemplateResponseMixin
+)
+
 from .constants import ALL_FIELDS
+from .filterset import filterset_factory
 
 
 class FilterMixin(object):

django_filters/widgets.py

@@ -1,18 +1,15 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from collections import Iterable
 from itertools import chain
-from django.utils.http import urlencode
 
 import django
 from django import forms
 from django.db.models.fields import BLANK_CHOICE_DASH
-
 from django.forms.utils import flatatt
-
 from django.utils.datastructures import MultiValueDict
 from django.utils.encoding import force_text
+from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
 from django.utils.six import string_types
 from django.utils.translation import ugettext as _

setup.cfg

@@ -3,3 +3,6 @@ license-file = LICENSE
 
 [wheel]
 universal=1
+
+[isort]
+multi_line_output=3

tests/models.py

@@ -1,12 +1,10 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django import forms
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
-
 REGULAR = 0
 MANAGER = 1
 ADMIN = 2

tests/rest_framework/test_backends.py

@@ -1,21 +1,22 @@
 from __future__ import unicode_literals
 
 import datetime
+import warnings
 from decimal import Decimal
 from unittest import skipIf
-import warnings
 
 from django.db.models import BooleanField
 from django.test import TestCase
 from django.test.utils import override_settings
-
+from django_filters import compat, filters
+from django_filters.rest_framework import (
+    DjangoFilterBackend,
+    FilterSet,
+    backends
+)
 from rest_framework import generics, serializers
 from rest_framework.test import APIRequestFactory
 
-from django_filters import compat, filters
-from django_filters.rest_framework import DjangoFilterBackend, FilterSet
-from django_filters.rest_framework import backends
-
 from .models import FilterableItem
 
 factory = APIRequestFactory()

tests/rest_framework/test_filters.py

@@ -1,6 +1,5 @@
 
 from django.test import TestCase
-
 from django_filters.rest_framework import filters
 from django_filters.widgets import BooleanWidget
 

tests/rest_framework/test_filterset.py

@@ -3,12 +3,11 @@
 from django.conf import settings
 from django.test import TestCase
 from django.test.utils import override_settings
-
-from django_filters.rest_framework import FilterSet, filters
 from django_filters.compat import is_crispy
+from django_filters.rest_framework import FilterSet, filters
 from django_filters.widgets import BooleanWidget
 
-from ..models import User, Article
+from ..models import Article, User
 
 
 class ArticleFilter(FilterSet):

tests/rest_framework/test_integration.py

@@ -7,20 +7,26 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.dateparse import parse_date
+from django_filters import STRICTNESS, filters
+from django_filters.rest_framework import DjangoFilterBackend, FilterSet
+from rest_framework import generics, serializers, status
+from rest_framework.test import APIRequestFactory
+
+from .models import (
+    BaseFilterableItem,
+    BasicModel,
+    DjangoFilterOrderingModel,
+    FilterableItem
+)
 
 try:
     from django.urls import reverse
 except ImportError:
     # Django < 1.10 compatibility
     from django.core.urlresolvers import reverse
 
-from rest_framework import generics, serializers, status
-from rest_framework.test import APIRequestFactory
 
-from django_filters import filters, STRICTNESS
-from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 
-from .models import BaseFilterableItem, BasicModel, FilterableItem, DjangoFilterOrderingModel
 
 factory = APIRequestFactory()
 

tests/settings.py

@@ -3,7 +3,6 @@
 from django_filters import STRICTNESS
 from django_filters.conf import DEFAULTS
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',

tests/test_conf.py

@@ -1,9 +1,7 @@
 
 from django.test import TestCase, override_settings
-
-from django_filters.conf import settings, is_callable
-from django_filters import FilterSet, STRICTNESS
-
+from django_filters import STRICTNESS, FilterSet
+from django_filters.conf import is_callable, settings
 from tests.models import User
 
 

tests/test_fields.py

@@ -1,18 +1,23 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from datetime import datetime, time, timedelta, tzinfo
 import decimal
+from datetime import datetime, time, timedelta, tzinfo
 
 from django import forms
 from django.test import TestCase, override_settings
-from django.utils.timezone import make_aware, get_default_timezone
-
-from django_filters.widgets import BaseCSVWidget, CSVWidget, RangeWidget
+from django.utils.timezone import get_default_timezone, make_aware
 from django_filters.fields import (
-    Lookup, LookupTypeField, BaseCSVField, BaseRangeField, RangeField,
-    DateRangeField, DateTimeRangeField, TimeRangeField, IsoDateTimeField
+    BaseCSVField,
+    BaseRangeField,
+    DateRangeField,
+    DateTimeRangeField,
+    IsoDateTimeField,
+    Lookup,
+    LookupTypeField,
+    RangeField,
+    TimeRangeField
 )
+from django_filters.widgets import BaseCSVWidget, CSVWidget, RangeWidget
 
 
 def to_d(float_value):