Drop support for Python 2 and old versions of Django. Add support for Django 3.

Author: solarissmoke

.travis.yml

@@ -5,6 +5,7 @@ python:
     - 3.5
     - 3.6
     - 3.7
+    - 3.8
     - pypy3
 services:
     - docker
@@ -29,10 +30,10 @@ addons:
 before_install:
     - mkdir -p $HOME/download-cache
     - >
-        if [[ $VERSION_ES == '>=2.0.0,<3.0.0' ]];
+        if [[ $VERSION_ES == '>=2,<3' ]];
         then
           docker run -d -p 9200:9200 elasticsearch:2.4.6-alpine
-        elif [[ $VERSION_ES == '>=5.0.0,<6.0.0' ]];
+        elif [[ $VERSION_ES == '>=5,<6' ]];
         then
           docker run -d -p 9200:9200 elasticsearch:5.6.10-alpine
         else
@@ -59,31 +60,34 @@ env:
     global:
         - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
     jobs:
-        - DJANGO_VERSION=">=1.11,<2.0" VERSION_ES=">=1.0.0,<2.0.0"
-        - DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=1.0.0,<2.0.0"
-        - DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=1.0.0,<2.0.0"
-        - DJANGO_VERSION=">=1.11,<2.0" VERSION_ES=">=2.0.0,<3.0.0"
-        - DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=2.0.0,<3.0.0"
-        - DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=2.0.0,<3.0.0"
-        - DJANGO_VERSION=">=1.11,<2.0" VERSION_ES=">=5.0.0,<6.0.0"
-        - DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=5.0.0,<6.0.0"
-        - DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=5.0.0,<6.0.0"
+        - DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=1,<2"
+        - DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=1,<2"
+        - DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=2,<3"
+        - DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=2,<3"
+        - DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=5,<6"
+        - DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=5,<6"
 jobs:
     allow_failures:
         - python: 'pypy3'
     exclude:
         - python: pypy3
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=5.0.0,<6.0.0"
+          env: DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=5,<6"
         - python: pypy3
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=2.0.0,<3.0.0"
+          env: DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=2,<3"
         - python: pypy3
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=1.0.0,<2.0.0"
+          env: DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=1,<2"
         - python: pypy3
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=5.0.0,<6.0.0"
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=5,<6"
         - python: pypy3
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=2.0.0,<3.0.0"
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=2,<3"
         - python: pypy3
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=1.0.0,<2.0.0"
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=1,<2"
+        - python: 3.5
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=1,<2"
+        - python: 3.5
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=2,<3"
+        - python: 3.5
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=5,<6"
 
 notifications:
     irc: 'irc.freenode.org#haystack'

README.rst

@@ -50,7 +50,7 @@ Requirements
 
 Haystack has a relatively easily-met set of requirements.
 
-* Python 2.7+ or Python 3.3+
+* Python 3.5+
 * A supported version of Django: https://www.djangoproject.com/download/#supported-versions
 
 Additionally, each backend has its own requirements. You should refer to

docs/conf.py

@@ -11,8 +11,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 import sys
 

docs/searchindex_api.rst

@@ -332,7 +332,6 @@ object and write its ``prepare`` method to populate/alter the data any way you
 choose. For instance, a (naive) user-created ``GeoPointField`` might look
 something like::
 
-    from django.utils import six
     from haystack import indexes
 
     class GeoPointField(indexes.CharField):
@@ -341,7 +340,7 @@ something like::
             super(GeoPointField, self).__init__(**kwargs)
 
         def prepare(self, obj):
-            return six.text_type("%s-%s" % (obj.latitude, obj.longitude))
+            return "%s-%s" % (obj.latitude, obj.longitude)
 
 The ``prepare`` method simply returns the value to be used for that field. It's
 entirely possible to include data that's not directly referenced to the object
@@ -615,4 +614,3 @@ For the impatient::
         def index_queryset(self, using=None):
             "Used when the entire index for model is updated."
             return Note.objects.filter(pub_date__lte=datetime.datetime.now())
-

example_project/bare_bones_app/models.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import datetime
 
 from django.db import models
@@ -14,7 +11,7 @@ class Cat(models.Model):
     created = models.DateTimeField(default=datetime.datetime.now)
     updated = models.DateTimeField(default=datetime.datetime.now)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     @models.permalink

example_project/bare_bones_app/search_indexes.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from bare_bones_app.models import Cat
 
 from haystack import indexes

example_project/regular_app/models.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import datetime
 
 from django.db import models
@@ -25,7 +22,7 @@ class Dog(models.Model):
     created = models.DateTimeField(default=datetime.datetime.now)
     updated = models.DateTimeField(default=datetime.datetime.now)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.full_name()
 
     @models.permalink
@@ -43,5 +40,5 @@ class Toy(models.Model):
     dog = models.ForeignKey(Dog, related_name="toys")
     name = models.CharField(max_length=60)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s's %s" % (self.dog.name, self.name)

example_project/regular_app/search_indexes.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from regular_app.models import Dog
 
 from haystack import indexes

example_project/settings.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 
 from django.conf import settings

haystack/__init__.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from pkg_resources import DistributionNotFound, get_distribution, parse_version

haystack/admin.py

@@ -1,13 +1,10 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from django.contrib.admin.options import ModelAdmin, csrf_protect_m
 from django.contrib.admin.views.main import SEARCH_VAR, ChangeList
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import InvalidPage, Paginator
 from django.shortcuts import render
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.translation import ungettext
 
 from haystack import connections
@@ -135,7 +132,7 @@ def changelist_view(self, request, extra_context=None):
         )
 
         context = {
-            "module_name": force_text(self.model._meta.verbose_name_plural),
+            "module_name": force_str(self.model._meta.verbose_name_plural),
             "selection_note": selection_note % {"count": len(changelist.result_list)},
             "selection_note_all": selection_note_all
             % {"total_count": changelist.result_count},

haystack/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.apps import AppConfig

haystack/backends/__init__.py

@@ -1,17 +1,13 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import copy
 from copy import deepcopy
 from time import time
 
-import six
-
 from django.conf import settings
 from django.db.models import Q
 from django.db.models.base import ModelBase
 from django.utils import tree
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from haystack.constants import VALID_FILTERS, FILTER_SEPARATOR, DEFAULT_ALIAS
 from haystack.exceptions import MoreLikeThisError, FacetingError
@@ -163,7 +159,7 @@ def prep_value(self, value):
         Hook to give the backend a chance to prep an attribute value before
         sending it to the search engine. By default, just force it to unicode.
         """
-        return force_text(value)
+        return force_str(value)
 
     def more_like_this(
         self, model_instance, additional_query_string=None, result_class=None
@@ -315,9 +311,6 @@ def __bool__(self):
         """
         return bool(self.children)
 
-    def __nonzero__(self):  # Python 2 compatibility
-        return type(self).__bool__(self)
-
     def __contains__(self, other):
         """
         Returns True is 'other' is a direct child of this instance.
@@ -407,12 +400,7 @@ def __repr__(self):
         )
 
     def _repr_query_fragment_callback(self, field, filter_type, value):
-        if six.PY3:
-            value = force_text(value)
-        else:
-            value = force_text(value).encode("utf8")
-
-        return "%s%s%s=%s" % (field, FILTER_SEPARATOR, filter_type, value)
+        return "%s%s%s=%s" % (field, FILTER_SEPARATOR, filter_type, force_str(value))
 
     def as_query_string(self, query_fragment_callback):
         """
@@ -785,7 +773,7 @@ def clean(self, query_fragment):
 
         A basic (override-able) implementation is provided.
         """
-        if not isinstance(query_fragment, six.string_types):
+        if not isinstance(query_fragment, str):
             return query_fragment
 
         words = query_fragment.split()

haystack/backends/elasticsearch2_backend.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import datetime
 
 from django.conf import settings

haystack/backends/elasticsearch5_backend.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import datetime
 import warnings
 

haystack/backends/elasticsearch_backend.py

@@ -1,12 +1,8 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import re
 import warnings
 from datetime import datetime, timedelta
 
-import six
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
@@ -813,9 +809,9 @@ def _from_python(self, value):
         iso = self._iso_datetime(value)
         if iso:
             return iso
-        elif isinstance(value, six.binary_type):
+        elif isinstance(value, bytes):
             # TODO: Be stricter.
-            return six.text_type(value, errors="replace")
+            return str(value, errors="replace")
         elif isinstance(value, set):
             return list(value)
         return value
@@ -825,7 +821,7 @@ def _to_python(self, value):
         if isinstance(value, (int, float, complex, list, tuple, bool)):
             return value
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             possible_datetime = DATETIME_REGEX.search(value)
 
             if possible_datetime:
@@ -894,7 +890,7 @@ def build_query_fragment(self, field, filter_type, value):
             if hasattr(value, "values_list"):
                 value = list(value)
 
-            if isinstance(value, six.string_types):
+            if isinstance(value, str):
                 # It's not an ``InputType``. Assume ``Clean``.
                 value = Clean(value)
             else:
@@ -945,7 +941,7 @@ def build_query_fragment(self, field, filter_type, value):
                     # Iterate over terms & incorportate the converted form of each into the query.
                     terms = []
 
-                    if isinstance(prepared_value, six.string_types):
+                    if isinstance(prepared_value, str):
                         for possible_value in prepared_value.split(" "):
                             terms.append(
                                 filter_types[filter_type]
@@ -1002,7 +998,7 @@ def build_alt_parser_query(self, parser_name, query_string="", **kwargs):
         kwarg_bits = []
 
         for key in sorted(kwargs.keys()):
-            if isinstance(kwargs[key], six.string_types) and " " in kwargs[key]:
+            if isinstance(kwargs[key], str) and " " in kwargs[key]:
                 kwarg_bits.append("%s='%s'" % (key, kwargs[key]))
             else:
                 kwarg_bits.append("%s=%s" % (key, kwargs[key]))

haystack/backends/simple_backend.py

@@ -2,12 +2,9 @@
 """
 A very basic, ORM-based backend for simple search during tests.
 """
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
+from functools import reduce
 from warnings import warn
 
-import six
 from django.db.models import Q
 
 from haystack import connections
@@ -71,7 +68,7 @@ def search(self, query_string, **kwargs):
 
                         if queries:
                             qs = model.objects.filter(
-                                six.moves.reduce(lambda x, y: x | y, queries)
+                                reduce(lambda x, y: x | y, queries)
                             )
                         else:
                             qs = []
@@ -128,7 +125,7 @@ def _build_sub_query(self, search_node):
 
                 term_list.append(value.prepare(self))
 
-        return (" ").join(map(six.text_type, term_list))
+        return (" ").join(map(str, term_list))
 
 
 class SimpleEngine(BaseEngine):