Skip to content

Commit

Permalink
sort imports
Browse files Browse the repository at this point in the history
  • Loading branch information
tony committed Aug 22, 2017
1 parent 0112ff5 commit 0611bae
Show file tree
Hide file tree
Showing 25 changed files with 124 additions and 225 deletions.
1 change: 0 additions & 1 deletion django_filters/conf.py
Expand Up @@ -8,7 +8,6 @@
from .constants import STRICTNESS
from .utils import deprecate


DEFAULTS = {
'DISABLE_HELP_TEXT': False,
'HELP_TEXT_FILTER': True,
Expand Down
8 changes: 3 additions & 5 deletions 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):
Expand Down
13 changes: 5 additions & 8 deletions 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
Expand All @@ -16,13 +15,11 @@
from .compat import pretty_name
from .conf import settings
from .constants import EMPTY_VALUES
from .fields import (
Lookup, LookupTypeField, BaseCSVField, BaseRangeField, RangeField,
DateRangeField, DateTimeRangeField, TimeRangeField, IsoDateTimeField
)
from .fields import (BaseCSVField, BaseRangeField, DateRangeField,
DateTimeRangeField, IsoDateTimeField, Lookup,
LookupTypeField, RangeField, TimeRangeField)
from .utils import label_for_filter


__all__ = [
'AllValuesFilter',
'AllValuesMultipleFilter',
Expand Down
17 changes: 9 additions & 8 deletions 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
Expand All @@ -10,13 +9,15 @@
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):
Expand Down
3 changes: 2 additions & 1 deletion 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):
Expand Down
8 changes: 4 additions & 4 deletions 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({
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand Down
11 changes: 6 additions & 5 deletions django_filters/views.py
@@ -1,11 +1,12 @@
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):
Expand Down
7 changes: 2 additions & 5 deletions 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 _
Expand Down
4 changes: 1 addition & 3 deletions 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
Expand Down
10 changes: 4 additions & 6 deletions tests/rest_framework/test_backends.py
@@ -1,21 +1,19 @@
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()
Expand Down
1 change: 0 additions & 1 deletion 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

Expand Down
5 changes: 2 additions & 3 deletions tests/rest_framework/test_filterset.py
Expand Up @@ -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):
Expand Down
12 changes: 7 additions & 5 deletions tests/rest_framework/test_integration.py
Expand Up @@ -7,20 +7,22 @@
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()

Expand Down
1 change: 0 additions & 1 deletion tests/settings.py
Expand Up @@ -3,7 +3,6 @@
from django_filters import STRICTNESS
from django_filters.conf import DEFAULTS


DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
Expand Down
6 changes: 2 additions & 4 deletions 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


Expand Down
16 changes: 7 additions & 9 deletions tests/test_fields.py
@@ -1,18 +1,16 @@
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.utils.timezone import get_default_timezone, make_aware
from django_filters.fields import (BaseCSVField, BaseRangeField,
DateRangeField, DateTimeRangeField,
IsoDateTimeField, Lookup, LookupTypeField,
RangeField, TimeRangeField)
from django_filters.widgets import BaseCSVWidget, CSVWidget, RangeWidget
from django_filters.fields import (
Lookup, LookupTypeField, BaseCSVField, BaseRangeField, RangeField,
DateRangeField, DateTimeRangeField, TimeRangeField, IsoDateTimeField
)


def to_d(float_value):
Expand Down
52 changes: 16 additions & 36 deletions tests/test_filtering.py
@@ -1,49 +1,29 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals

import datetime
import mock
import unittest

import django
import mock
from django import forms
from django.test import TestCase, override_settings
from django.utils import six
from django.utils import six, timezone
from django.utils.timezone import now
from django.utils import timezone

from django_filters.filterset import FilterSet
from django_filters.filters import AllValuesFilter
from django_filters.filters import AllValuesMultipleFilter
from django_filters.filters import CharFilter
from django_filters.filters import ChoiceFilter
from django_filters.filters import DateRangeFilter
from django_filters.filters import DateFromToRangeFilter
from django_filters.filters import DateTimeFromToRangeFilter
from django_filters.filters import DurationFilter
from django_filters.filters import MultipleChoiceFilter
from django_filters.filters import ModelChoiceFilter
from django_filters.filters import TypedMultipleChoiceFilter
from django_filters.filters import ModelMultipleChoiceFilter
from django_filters.filters import NumberFilter
from django_filters.filters import OrderingFilter
from django_filters.filters import RangeFilter
from django_filters.filters import TimeRangeFilter
from django_filters.exceptions import FieldLookupError
from django_filters.filters import (AllValuesFilter, AllValuesMultipleFilter,
CharFilter, ChoiceFilter,
DateFromToRangeFilter, DateRangeFilter,
DateTimeFromToRangeFilter, DurationFilter,
ModelChoiceFilter,
ModelMultipleChoiceFilter,
MultipleChoiceFilter, NumberFilter,
OrderingFilter, RangeFilter,
TimeRangeFilter, TypedMultipleChoiceFilter)
from django_filters.filterset import FilterSet

from .models import User
from .models import Comment
from .models import Book
from .models import Article
from .models import Company
from .models import Location
from .models import Account
from .models import BankAccount
from .models import Profile
from .models import Node
from .models import DirectedNode
from .models import STATUS_CHOICES
from .models import SpacewalkRecord
from .models import (STATUS_CHOICES, Account, Article, BankAccount, Book,
Comment, Company, DirectedNode, Location, Node, Profile,
SpacewalkRecord, User)


class CharFilterTests(TestCase):
Expand Down

0 comments on commit 0611bae

Please sign in to comment.