Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions drf_haystack/filters.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import operator
from functools import reduce

import six
from django.core.exceptions import ImproperlyConfigured
from haystack.query import SearchQuerySet
from rest_framework.filters import BaseFilterBackend, OrderingFilter
Expand Down Expand Up @@ -111,7 +110,7 @@ def process_filters(self, filters, queryset, view):
bit = queryset.query.clean(word.strip())
kwargs = {field_name: bit}
query_bits.append(view.query_object(**kwargs))
return six.moves.reduce(operator.and_, filter(lambda x: x, query_bits))
return reduce(operator.and_, filter(lambda x: x, query_bits))


class HaystackGEOSpatialFilter(BaseHaystackFilterBackend):
Expand Down
8 changes: 4 additions & 4 deletions drf_haystack/query.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import operator
import warnings
from functools import reduce
from itertools import chain

import six
from dateutil import parser

from drf_haystack import constants
Expand Down Expand Up @@ -146,20 +146,20 @@ def build_query(self, **filters):

param_queries = [pq for pq in param_queries if pq]
if len(param_queries) > 0:
term = six.moves.reduce(self.get_same_param_operator(param), param_queries)
term = reduce(self.get_same_param_operator(param), param_queries)
if excluding_term:
applicable_exclusions.append(term)
else:
applicable_filters.append(term)

applicable_filters = (
six.moves.reduce(self.default_operator, filter(lambda x: x, applicable_filters))
reduce(self.default_operator, filter(lambda x: x, applicable_filters))
if applicable_filters
else self.view.query_object()
)

applicable_exclusions = (
six.moves.reduce(self.default_operator, filter(lambda x: x, applicable_exclusions))
reduce(self.default_operator, filter(lambda x: x, applicable_exclusions))
if applicable_exclusions
else self.view.query_object()
)
Expand Down