Skip to content

Commit 03f7f17

Browse files
committed
Remove filter_queryset with django filter 1.1 support
1 parent 9dd1f6f commit 03f7f17

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

rest_framework_json_api/django_filters/backends.py

-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import re
22

3-
from django_filters import VERSION
43
from django_filters.rest_framework import DjangoFilterBackend
54
from rest_framework.exceptions import ValidationError
65
from rest_framework.settings import api_settings
@@ -123,22 +122,3 @@ def get_filterset_kwargs(self, request, queryset, view):
123122
'request': request,
124123
'filter_keys': filter_keys,
125124
}
126-
127-
def filter_queryset(self, request, queryset, view):
128-
"""
129-
This is backwards compatibility to django-filter 1.1 (required for Python 2.7).
130-
In 1.1 `filter_queryset` does not call `get_filterset` or `get_filterset_kwargs`.
131-
"""
132-
# TODO: remove when Python 2.7 support is deprecated
133-
if VERSION >= (2, 0, 0):
134-
return super(DjangoFilterBackend, self).filter_queryset(request, queryset, view)
135-
136-
filter_class = self.get_filter_class(view, queryset)
137-
138-
kwargs = self.get_filterset_kwargs(request, queryset, view)
139-
self._validate_filter(kwargs.pop('filter_keys'), filter_class)
140-
141-
if filter_class:
142-
return filter_class(kwargs['data'], queryset=queryset, request=request).qs
143-
144-
return queryset

0 commit comments

Comments
 (0)