Merge pull request #61 from rpkilby/update-django-filter

Update django-filter to 0.12.0

Author: Ryan P Kilby

.travis.yml

@@ -13,7 +13,7 @@ env:
   - DJANGO="Django>=1.9,<1.10"
 install:
   - travis_retry pip install -q $DJANGO
-  - python setup.py install
+  - pip install .
 script: python manage.py test rest_framework_filters
 
 matrix:

rest_framework_filters/fields.py

@@ -1,10 +1,5 @@
 from django import forms
-
-# TODO: Remove when django-filter 0.12.0 is released
-try:
-    from django_filters import BooleanWidget
-except ImportError:
-    from .widgets import BooleanWidget
+from django_filters.widgets import BooleanWidget
 
 
 class BooleanField(forms.BooleanField):

rest_framework_filters/filters.py

@@ -73,22 +73,11 @@ class BooleanFilter(BooleanFilter):
     field_class = fields.BooleanField
 
 
-class InSetFilterBase(object):
-    def filter(self, qs, value):
-        if value in ([], (), {}, None, ''):
-            return qs
-        method = qs.exclude if self.exclude else qs.filter
-        qs = method(**{self.name: value})
-        if self.distinct:
-            qs = qs.distinct()
-        return qs
-
-
-class InSetNumberFilter(InSetFilterBase, NumberFilter):
+class InSetNumberFilter(Filter):
     field_class = fields.ArrayDecimalField
 
 
-class InSetCharFilter(InSetFilterBase, NumberFilter):
+class InSetCharFilter(Filter):
     field_class = fields.ArrayCharField
 
 

rest_framework_filters/filterset.py

@@ -69,9 +69,9 @@ def __init__(self, *args, **kwargs):
                 filter_.setup_filterset()
 
                 # Add an 'isnull' filter to allow checking if the relation is empty.
-                isnull = "%s%sisnull" % (filter_.name, LOOKUP_SEP)
-                if isnull not in self.filters:
-                    self.filters[isnull] = filters.BooleanFilter(name=isnull)
+                filter_name = "%s%sisnull" % (filter_.name, LOOKUP_SEP)
+                if filter_name not in self.filters:
+                    self.filters[filter_name] = filters.BooleanFilter(name=filter_.name, lookup_type='isnull')
 
             elif isinstance(filter_, filters.MethodFilter):
                 filter_.resolve_action()
@@ -191,9 +191,9 @@ def fix_filter_field(cls, f):
         """
         lookup_type = f.lookup_type
         if lookup_type == 'isnull':
-            return filters.BooleanFilter(name=("%s%sisnull" % (f.name, LOOKUP_SEP)))
+            return filters.BooleanFilter(name=f.name, lookup_type='isnull')
         if lookup_type == 'in' and type(f) == filters.NumberFilter:
-            return filters.InSetNumberFilter(name=("%s%sin" % (f.name, LOOKUP_SEP)))
+            return filters.InSetNumberFilter(name=f.name, lookup_type='in')
         if lookup_type == 'in' and type(f) == filters.CharFilter:
-            return filters.InSetCharFilter(name=("%s%sin" % (f.name, LOOKUP_SEP)))
+            return filters.InSetCharFilter(name=f.name, lookup_type='in')
         return f

rest_framework_filters/widgets.py

@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup
-import re
 import os
-import sys
 
 
 def get_packages(package):
@@ -43,10 +41,9 @@ def get_package_data(package):
     packages=get_packages('rest_framework_filters'),
     package_data=get_package_data('rest_framework_filters'),
     zip_safe=False,
-    #test_suite='rest_framework.runtests.runtests.main',
     install_requires=[
         'djangorestframework',
-        'django-filter>=0.11.0',
+        'django-filter>=0.12.0',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',