Apply pyupgrade fixes

Author: ulgens

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import os
 import re

drf_haystack/__init__.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
 import warnings
 
 

drf_haystack/fields.py

@@ -1,17 +1,13 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 import six
 from rest_framework import fields
 
 
-class DRFHaystackFieldMixin(object):
+class DRFHaystackFieldMixin:
     prefix_field_names = False
 
     def __init__(self, **kwargs):
         self.prefix_field_names = kwargs.pop('prefix_field_names', False)
-        super(DRFHaystackFieldMixin, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def bind(self, field_name, parent):
         """
@@ -95,11 +91,10 @@ class FacetDictField(fields.DictField):
     """
 
     def to_representation(self, value):
-        return dict(
-            [(six.text_type(key), self.child.to_representation(key, val))
+        return {
+            str(key): self.child.to_representation(key, val)
              for key, val in value.items()
-             ]
-        )
+        }
 
 
 class FacetListField(fields.ListField):

drf_haystack/filters.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 import operator
 import six
 from functools import reduce
@@ -154,7 +150,7 @@ class HaystackHighlightFilter(HaystackFilter):
     """
 
     def filter_queryset(self, request, queryset, view):
-        queryset = super(HaystackHighlightFilter, self).filter_queryset(request, queryset, view)
+        queryset = super().filter_queryset(request, queryset, view)
         if self.get_request_filters(request) and isinstance(queryset, SearchQuerySet):
             queryset = queryset.highlight()
         return queryset
@@ -225,7 +221,7 @@ class HaystackOrderingFilter(OrderingFilter):
     """
 
     def get_default_valid_fields(self, queryset, view, context={}):
-        valid_fields = super(HaystackOrderingFilter, self).get_default_valid_fields(queryset, view, context)
+        valid_fields = super().get_default_valid_fields(queryset, view, context)
 
         # Check if we need to support aggregate serializers
         serializer_class = view.get_serializer_class()
@@ -255,7 +251,7 @@ def get_valid_fields(self, queryset, view, context={}):
             valid_fields = list(set(reduce(operator.concat, model_fields)))
         else:
             valid_fields = [
-                (item, item) if isinstance(item, six.string_types) else item
+                (item, item) if isinstance(item, str) else item
                 for item in valid_fields
             ]
 

drf_haystack/generics.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 import six
 
 from django.contrib.contenttypes.models import ContentType
@@ -72,7 +68,7 @@ def get_object(self):
         queryset = self.get_queryset()
         if "model" in self.request.query_params:
             try:
-                app_label, model = map(six.text_type.lower, self.request.query_params["model"].split(".", 1))
+                app_label, model = map(str.lower, self.request.query_params["model"].split(".", 1))
                 ctype = ContentType.objects.get(app_label=app_label, model=model)
                 queryset = self.get_queryset(index_models=[ctype.model_class()])
             except (ValueError, ContentType.DoesNotExist):
@@ -96,7 +92,7 @@ def get_object(self):
         raise Http404("No result matches the given query.")
 
     def filter_queryset(self, queryset):
-        queryset = super(HaystackGenericAPIView, self).filter_queryset(queryset)
+        queryset = super().filter_queryset(queryset)
 
         if self.load_all:
             queryset = queryset.load_all()

drf_haystack/mixins.py

@@ -1,14 +1,10 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from drf_haystack.filters import HaystackFacetFilter
 
 
-class MoreLikeThisMixin(object):
+class MoreLikeThisMixin:
     """
     Mixin class for supporting "more like this" on an API View.
     """
@@ -33,7 +29,7 @@ def more_like_this(self, request, pk=None):
         return Response(serializer.data)
 
 
-class FacetMixin(object):
+class FacetMixin:
     """
     Mixin class for supporting faceting on an API View.
     """
@@ -58,7 +54,7 @@ def facets(self, request):
 
             field, value = facet.split(":", 1)
             if value:
-                queryset = queryset.narrow('%s:"%s"' % (field, queryset.query.clean(value)))
+                queryset = queryset.narrow(f'{field}:"{queryset.query.clean(value)}"')
 
         serializer = self.get_facet_serializer(queryset.facet_counts(), objects=queryset, many=False)
         return Response(serializer.data)
@@ -119,4 +115,4 @@ def get_facet_objects_serializer_class(self):
         Defaults to using the views ``self.serializer_class`` if not
         ``self.facet_objects_serializer_class`` is set.
         """
-        return self.facet_objects_serializer_class or super(FacetMixin, self).get_serializer_class()
+        return self.facet_objects_serializer_class or super().get_serializer_class()

drf_haystack/query.py

@@ -1,21 +1,16 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 import operator
 import six
 import warnings
 from itertools import chain
 
 
-from six.moves import zip
 from dateutil import parser
 
 from drf_haystack import constants
 from drf_haystack.utils import merge_dict
 
 
-class BaseQueryBuilder(object):
+class BaseQueryBuilder:
     """
     Query builder base class.
     """
@@ -79,12 +74,12 @@ class FilterQueryBuilder(BaseQueryBuilder):
     """
 
     def __init__(self, backend, view):
-        super(FilterQueryBuilder, self).__init__(backend, view)
+        super().__init__(backend, view)
 
         assert getattr(self.backend, "default_operator", None) in (operator.and_, operator.or_), (
-            "%(cls)s.default_operator must be either 'operator.and_' or 'operator.or_'." % {
-                "cls": self.backend.__class__.__name__
-            })
+            "{cls}.default_operator must be either 'operator.and_' or 'operator.or_'.".format(
+                cls=self.backend.__class__.__name__
+            ))
         self.default_operator = self.backend.default_operator
         self.default_same_param_operator = getattr(self.backend, "default_same_param_operator", self.default_operator)
 
@@ -227,7 +222,7 @@ def parse_field_options(self, *options):
         """
         defaults = {}
         for option in options:
-            if isinstance(option, six.text_type):
+            if isinstance(option, str):
                 tokens = [token.strip() for token in option.split(self.view.lookup_sep)]
 
                 for token in tokens:
@@ -257,7 +252,7 @@ class SpatialQueryBuilder(BaseQueryBuilder):
     """
 
     def __init__(self, backend, view):
-        super(SpatialQueryBuilder, self).__init__(backend, view)
+        super().__init__(backend, view)
 
         assert getattr(self.backend, "point_field", None) is not None, (
             "%(cls)s.point_field cannot be None. Set the %(cls)s.point_field "
@@ -293,9 +288,9 @@ def build_query(self, **filters):
 
         applicable_filters = None
 
-        filters = dict((k, filters[k]) for k in chain(self.D.UNITS.keys(),
-                                                      [constants.DRF_HAYSTACK_SPATIAL_QUERY_PARAM]) if k in filters)
-        distance = dict((k, v) for k, v in filters.items() if k in self.D.UNITS.keys())
+        filters = {k: filters[k] for k in chain(self.D.UNITS.keys(),
+                                                      [constants.DRF_HAYSTACK_SPATIAL_QUERY_PARAM]) if k in filters}
+        distance = {k: v for k, v in filters.items() if k in self.D.UNITS.keys()}
 
         try:
             latitude, longitude = map(float, self.tokenize(filters[constants.DRF_HAYSTACK_SPATIAL_QUERY_PARAM],

drf_haystack/serializers.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 import copy
 import six
 import warnings
@@ -46,7 +42,7 @@ class Meta(type):
     index_aliases = {}
 
     def __new__(mcs, name, bases, attrs):
-        cls = super(Meta, mcs).__new__(mcs, str(name), bases, attrs)
+        cls = super().__new__(mcs, str(name), bases, attrs)
 
         if cls.fields and cls.exclude:
             raise ImproperlyConfigured("%s cannot define both 'fields' and 'exclude'." % name)
@@ -69,7 +65,7 @@ class HaystackSerializerMeta(serializers.SerializerMetaclass):
     def __new__(mcs, name, bases, attrs):
         attrs.setdefault("_abstract", False)
 
-        cls = super(HaystackSerializerMeta, mcs).__new__(mcs, str(name), bases, attrs)
+        cls = super().__new__(mcs, str(name), bases, attrs)
 
         if getattr(cls, "Meta", None):
             cls.Meta = Meta("Meta", (Meta,), dict(cls.Meta.__dict__))
@@ -80,7 +76,7 @@ def __new__(mcs, name, bases, attrs):
         return cls
 
 
-class HaystackSerializer(six.with_metaclass(HaystackSerializerMeta, serializers.Serializer)):
+class HaystackSerializer(serializers.Serializer, metaclass=HaystackSerializerMeta):
     """
     A `HaystackSerializer` which populates fields based on
     which models that are available in the SearchQueryset.
@@ -111,7 +107,7 @@ class HaystackSerializer(six.with_metaclass(HaystackSerializerMeta, serializers.
     })
 
     def __init__(self, instance=None, data=empty, **kwargs):
-        super(HaystackSerializer, self).__init__(instance, data, **kwargs)
+        super().__init__(instance, data, **kwargs)
 
         if not self.Meta.index_classes and not self.Meta.serializers:
             raise ImproperlyConfigured("You must set either the 'index_classes' or 'serializers' "
@@ -183,9 +179,9 @@ def get_fields(self):
             prefix = ""
             if prefix_field_names:
                 prefix = "_%s__" % self._get_index_class_name(index_cls)
-            for field_name, field_type in six.iteritems(index_cls.fields):
+            for field_name, field_type in index_cls.fields.items():
                 orig_name = field_name
-                field_name = "%s%s" % (prefix, field_name)
+                field_name = f"{prefix}{field_name}"
 
                 # Don't use this field if it is in `ignore_fields`
                 if orig_name in ignore_fields or field_name in ignore_fields:
@@ -223,7 +219,7 @@ def to_representation(self, instance):
         if self.Meta.serializers:
             ret = self.multi_serializer_representation(instance)
         else:
-            ret = super(HaystackSerializer, self).to_representation(instance)
+            ret = super().to_representation(instance)
             prefix_field_names = len(getattr(self.Meta, "index_classes")) > 1
             current_index = self._get_index_class_name(type(instance.searchindex))
             for field in self.fields.keys():
@@ -264,7 +260,7 @@ class FacetFieldSerializer(serializers.Serializer):
 
     def __init__(self, *args, **kwargs):
         self._parent_field = None
-        super(FacetFieldSerializer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     @property
     def parent_field(self):
@@ -317,7 +313,7 @@ def get_text(self, instance):
         The text field should contain the faceted value.
         """
         instance = instance[0]
-        if isinstance(instance, (six.text_type, six.string_types)):
+        if isinstance(instance, (str, (str,))):
             return serializers.CharField(read_only=True).to_representation(instance)
         elif isinstance(instance, datetime):
             return serializers.DateTimeField(read_only=True).to_representation(instance)
@@ -346,10 +342,10 @@ def get_narrow_url(self, instance):
             del query_params[page_query_param]
 
         selected_facets = set(query_params.pop(self.root.facet_query_params_text, []))
-        selected_facets.add("%(field)s_exact:%(text)s" % {"field": self.parent_field, "text": text})
+        selected_facets.add(f"{self.parent_field}_exact:{text}")
         query_params.setlist(self.root.facet_query_params_text, sorted(selected_facets))
 
-        path = "%(path)s?%(query)s" % {"path": request.path_info, "query": query_params.urlencode()}
+        path = f"{request.path_info}?{query_params.urlencode()}"
         url = request.build_absolute_uri(path)
         return serializers.Hyperlink(url, "narrow-url")
 
@@ -359,10 +355,10 @@ def to_representation(self, field, instance):
         so that each field can query it to see what kind of attribute they are processing.
         """
         self.parent_field = field
-        return super(FacetFieldSerializer, self).to_representation(instance)
+        return super().to_representation(instance)
 
 
-class HaystackFacetSerializer(six.with_metaclass(HaystackSerializerMeta, serializers.Serializer)):
+class HaystackFacetSerializer(serializers.Serializer, metaclass=HaystackSerializerMeta):
     """
     The ``HaystackFacetSerializer`` is used to serialize the ``facet_counts()``
     dictionary results on a ``SearchQuerySet`` instance.
@@ -426,7 +422,7 @@ def facet_query_params_text(self):
         return self.context["facet_query_params_text"]
 
 
-class HaystackSerializerMixin(object):
+class HaystackSerializerMixin:
     """
     This mixin can be added to a serializer to use the actual object as the data source for serialization rather
     than the data stored in the search index fields.  This makes it easy to return data from search results in
@@ -435,10 +431,10 @@ class HaystackSerializerMixin(object):
 
     def to_representation(self, instance):
         obj = instance.object
-        return super(HaystackSerializerMixin, self).to_representation(obj)
+        return super().to_representation(obj)
 
 
-class HighlighterMixin(object):
+class HighlighterMixin:
     """
     This mixin adds support for ``highlighting`` (the pure python, portable
     version, not SearchQuerySet().highlight()). See Haystack docs
@@ -474,11 +470,11 @@ def get_terms(self, data):
         """
         Returns the terms to be highlighted
         """
-        terms = " ".join(six.itervalues(self.context["request"].GET))
+        terms = " ".join(self.context["request"].GET.values())
         return terms
 
     def to_representation(self, instance):
-        ret = super(HighlighterMixin, self).to_representation(instance)
+        ret = super().to_representation(instance)
         terms = self.get_terms(ret)
         if terms:
             highlighter = self.get_highlighter()(terms, **{

drf_haystack/utils.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 import six
 from copy import deepcopy
 
@@ -20,7 +16,7 @@ def merge_dict(a, b):
         return b
 
     result = deepcopy(a)
-    for key, val in six.iteritems(b):
+    for key, val in b.items():
         if key in result and isinstance(result[key], dict):
             result[key] = merge_dict(result[key], val)
         elif key in result and isinstance(result[key], list):

drf_haystack/viewsets.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, unicode_literals
-
 from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
 from rest_framework.viewsets import ViewSetMixin