Merge pull request #485 from rpkilby/deprecation-fixes

Fix various deprecations

django_filters/compat.py

@@ -32,3 +32,9 @@ def remote_queryset(field):
     limit_choices_to = field.get_limit_choices_to()
 
     return model._default_manager.complex_filter(limit_choices_to)
+
+
+def format_value(widget, value):
+    if django.VERSION >= (1, 10):
+        return widget.format_value(value)
+    return widget._format_value(value)

django_filters/widgets.py

@@ -16,6 +16,8 @@
 from django.utils.six import string_types
 from django.utils.translation import ugettext as _
 
+from .compat import format_value
+
 
 class LinkWidget(forms.Widget):
     def __init__(self, attrs=None, choices=()):
@@ -151,7 +153,7 @@ def value_from_datadict(self, data, files, name):
 
     def render(self, name, value, attrs=None):
         if self._isiterable(value):
-            value = [force_text(self._format_value(v)) for v in value]
+            value = [force_text(format_value(self, v)) for v in value]
             value = ','.join(list(value))
 
         return super(CSVWidget, self).render(name, value, attrs)

tests/rest_framework/test_backends.py

@@ -4,11 +4,16 @@
 from decimal import Decimal
 
 from django.conf.urls import url
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.dateparse import parse_date
 
+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
 
@@ -36,9 +41,9 @@ class FilterFieldsRootView(generics.ListCreateAPIView):
 
 # These class are used to test a filter class.
 class SeveralFieldsFilter(FilterSet):
-    text = filters.CharFilter(lookup_type='icontains')
-    decimal = filters.NumberFilter(lookup_type='lt')
-    date = filters.DateFilter(lookup_type='gt')
+    text = filters.CharFilter(lookup_expr='icontains')
+    decimal = filters.NumberFilter(lookup_expr='lt')
+    date = filters.DateFilter(lookup_expr='gt')
 
     class Meta:
         model = FilterableItem
@@ -54,7 +59,7 @@ class FilterClassRootView(generics.ListCreateAPIView):
 
 # These classes are used to test a misconfigured filter class.
 class MisconfiguredFilter(FilterSet):
-    text = filters.CharFilter(lookup_type='icontains')
+    text = filters.CharFilter(lookup_expr='icontains')
 
     class Meta:
         model = BasicModel
@@ -81,6 +86,7 @@ class BaseFilterableItemFilter(FilterSet):
 
     class Meta:
         model = BaseFilterableItem
+        fields = '__all__'
 
 
 class BaseFilterableItemFilterRootView(generics.ListCreateAPIView):

tests/settings.py

@@ -25,6 +25,4 @@
 }]
 
 
-SILENCED_SYSTEM_CHECKS = [
-    '1_7.W001',  # Unset MIDDLEWARE_CLASSES warning
-]
+MIDDLEWARE = []

tests/test_forms.py

@@ -174,9 +174,9 @@ class Meta:
                 model = ManagerGroup
                 fields = ['users', 'manager']
         f = F().form
-        self.assertEquals(
+        self.assertEqual(
             list(f.fields['users'].choices), [(2, 'active')]
         )
-        self.assertEquals(
+        self.assertEqual(
             list(f.fields['manager'].choices), [('', '---------'), (3, 'manager')]
         )