Migrate to new DRF FilterSet and backend (#112)

Author: Ryan P Kilby

rest_framework_filters/backends.py

@@ -1,12 +1,12 @@
 
 from django.template import loader
 from rest_framework import compat
-import rest_framework.filters
+from django_filters.rest_framework import backends
 
 from .filterset import FilterSet
 
 
-class DjangoFilterBackend(rest_framework.filters.DjangoFilterBackend):
+class DjangoFilterBackend(backends.DjangoFilterBackend):
     default_filter_set = FilterSet
 
     def filter_queryset(self, request, queryset, view):

rest_framework_filters/fields.py

@@ -2,12 +2,6 @@
 import warnings
 from django import forms
 
-from django_filters.widgets import BooleanWidget
-
-
-class BooleanField(forms.BooleanField):
-    widget = BooleanWidget
-
 
 class ArrayDecimalField(forms.DecimalField):
     def __init__(self, *args, **kwargs):

rest_framework_filters/filters.py

@@ -4,7 +4,7 @@
 import warnings
 from django.utils import six
 
-from django_filters.filters import *
+from django_filters.rest_framework.filters import *
 
 from . import fields
 
@@ -52,12 +52,6 @@ class AllLookupsFilter(Filter):
 # Fixed-up versions of some of the default filters
 ###################################################
 
-# This class is necessary, as directly django-filter's BooleanFilter
-# is using the incorrect form widget.
-class BooleanFilter(BooleanFilter):
-    field_class = fields.BooleanField
-
-
 class InSetNumberFilter(Filter):
     field_class = fields.ArrayDecimalField
 

rest_framework_filters/filterset.py

@@ -5,12 +5,11 @@
 import copy
 import warnings
 
-from django.db import models
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.fields.related import ForeignObjectRel
 from django.utils import six
 
-from django_filters import filterset
+from django_filters import filterset, rest_framework
 
 from . import filters
 from . import utils
@@ -93,19 +92,7 @@ def related_filters(self):
         return self._related_filters
 
 
-class FilterSet(six.with_metaclass(FilterSetMetaclass, filterset.FilterSet)):
-    filter_overrides = {
-        # uses API-friendly django_filters.BooleanWidget
-        models.BooleanField: {
-            'filter_class': filters.BooleanFilter,
-        },
-
-        # In order to support ISO-8601 -- which is the default output for
-        # DRF -- we need to use django-filter's IsoDateTimeFilter
-        models.DateTimeField: {
-            'filter_class': filters.IsoDateTimeFilter,
-        },
-    }
+class FilterSet(six.with_metaclass(FilterSetMetaclass, rest_framework.FilterSet)):
     _subset_cache = {}
 
     def __init__(self, *args, **kwargs):

setup.py

@@ -43,7 +43,7 @@ def get_package_data(package):
     zip_safe=False,
     install_requires=[
         'djangorestframework',
-        'django-filter>=0.14.0',
+        'django-filter>=0.15.0',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',

tests/test_deprecations.py

@@ -73,8 +73,9 @@ class Meta:
                     order_by = 'username'
                     fields = []
 
-            F().qs
-            self.assertEqual(len(w), 1)
+            # we should get a deprecation warning from django-filter and
+            # a compatibility warning from django-rest-framework-filters
+            self.assertEqual(len(w), 2)
             self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
 
 

tests/testapp/filters.py

@@ -15,6 +15,7 @@ class DFUserFilter(django_filters.FilterSet):
 
     class Meta:
         model = User
+        fields = '__all__'
 
 
 class NoteFilterWithAll(FilterSet):