Merge pull request #1710 from MrKioZ/master

acdha · web-flow · commit 87bd4c1ad74f · 2020-01-20T08:55:52.000-05:00
Fix for issue #1697 Django 3.0
diff --git a/haystack/utils/__init__.py b/haystack/utils/__init__.py
@@ -3,10 +3,10 @@
 from __future__ import unicode_literals
 
 import importlib
+import six
 import re
 
 from django.conf import settings
-from django.utils import six
 
 from haystack.constants import ID, DJANGO_CT, DJANGO_ID
 from haystack.utils.highlighting import Highlighter
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import setup
 
-install_requires = ["Django>=1.11"]
+install_requires = ["Django>=1.11", "six"]
 
 tests_require = [
     "pysolr>=3.7.0",
