Skip to content

Commit 69807e6

Browse files
committed
Remove six usages
With the help of https://six.readthedocs.io/#module-six.moves
1 parent c2b8457 commit 69807e6

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

drf_haystack/filters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import operator
22
from functools import reduce
33

4-
import six
54
from django.core.exceptions import ImproperlyConfigured
65
from haystack.query import SearchQuerySet
76
from rest_framework.filters import BaseFilterBackend, OrderingFilter
@@ -111,7 +110,7 @@ def process_filters(self, filters, queryset, view):
111110
bit = queryset.query.clean(word.strip())
112111
kwargs = {field_name: bit}
113112
query_bits.append(view.query_object(**kwargs))
114-
return six.moves.reduce(operator.and_, filter(lambda x: x, query_bits))
113+
return reduce(operator.and_, filter(lambda x: x, query_bits))
115114

116115

117116
class HaystackGEOSpatialFilter(BaseHaystackFilterBackend):

drf_haystack/query.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import operator
22
import warnings
3+
from functools import reduce
34
from itertools import chain
45

5-
import six
66
from dateutil import parser
77

88
from drf_haystack import constants
@@ -146,20 +146,20 @@ def build_query(self, **filters):
146146

147147
param_queries = [pq for pq in param_queries if pq]
148148
if len(param_queries) > 0:
149-
term = six.moves.reduce(self.get_same_param_operator(param), param_queries)
149+
term = reduce(self.get_same_param_operator(param), param_queries)
150150
if excluding_term:
151151
applicable_exclusions.append(term)
152152
else:
153153
applicable_filters.append(term)
154154

155155
applicable_filters = (
156-
six.moves.reduce(self.default_operator, filter(lambda x: x, applicable_filters))
156+
reduce(self.default_operator, filter(lambda x: x, applicable_filters))
157157
if applicable_filters
158158
else self.view.query_object()
159159
)
160160

161161
applicable_exclusions = (
162-
six.moves.reduce(self.default_operator, filter(lambda x: x, applicable_exclusions))
162+
reduce(self.default_operator, filter(lambda x: x, applicable_exclusions))
163163
if applicable_exclusions
164164
else self.view.query_object()
165165
)

0 commit comments

Comments
 (0)