Merge pull request django-haystack#1689 from the5fire/fix-six-for-django3.0

using six replace django six

Author: acdha

haystack/backends/__init__.py

@@ -1,12 +1,15 @@
 # -*- 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 six
 from django.utils import tree
 from django.utils.encoding import force_text
 

haystack/backends/elasticsearch_backend.py

@@ -6,9 +6,9 @@
 import warnings
 from datetime import datetime, timedelta
 
+import six
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 
 import haystack
 from haystack.backends import BaseEngine, BaseSearchBackend, BaseSearchQuery, log_query

haystack/backends/simple_backend.py

@@ -7,8 +7,8 @@
 
 from warnings import warn
 
+import six
 from django.db.models import Q
-from django.utils import six
 
 from haystack import connections
 from haystack.backends import (

haystack/backends/solr_backend.py

@@ -4,9 +4,9 @@
 
 import warnings
 
+import six
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 
 import haystack
 from haystack.backends import (

haystack/backends/whoosh_backend.py

@@ -9,9 +9,9 @@
 import threading
 import warnings
 
+import six
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 from django.utils.datetime_safe import datetime
 from django.utils.encoding import force_text
 

haystack/fields.py

@@ -4,8 +4,9 @@
 import re
 from inspect import ismethod
 
+import six
 from django.template import loader
-from django.utils import datetime_safe, six
+from django.utils import datetime_safe
 
 from haystack.exceptions import SearchFieldError
 from haystack.utils import get_model_ct_tuple

haystack/indexes.py

@@ -8,7 +8,7 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.encoding import force_text
-from django.utils.six import with_metaclass
+from six import with_metaclass
 
 from haystack import connection_router, connections
 from haystack.constants import Indexable  # NOQA — exposed as a public export

haystack/inputs.py

@@ -5,7 +5,8 @@
 import re
 import warnings
 
-from django.utils.encoding import force_text, python_2_unicode_compatible
+from django.utils.encoding import force_text
+from six import python_2_unicode_compatible
 
 
 @python_2_unicode_compatible

haystack/management/commands/clear_index.py

@@ -2,8 +2,8 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+import six
 from django.core.management.base import BaseCommand
-from django.utils import six
 
 from haystack import connections
 

haystack/models.py

@@ -4,8 +4,8 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+import six
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.text import capfirst
 

haystack/panels.py

@@ -4,9 +4,9 @@
 
 import datetime
 
+import six
 from debug_toolbar.panels import DebugPanel
 from django.template.loader import render_to_string
-from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from haystack import connections

haystack/query.py

@@ -5,7 +5,7 @@
 import operator
 import warnings
 
-from django.utils import six
+import six
 
 from haystack import connection_router, connections
 from haystack.backends import SQ

haystack/templatetags/highlight.py

@@ -2,10 +2,10 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+import six
 from django import template
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 
 from haystack.utils import importlib
 

haystack/utils/__init__.py

@@ -6,6 +6,7 @@
 import six
 import re
 
+import six
 from django.conf import settings
 
 from haystack.constants import ID, DJANGO_CT, DJANGO_ID

haystack/utils/loading.py

@@ -8,6 +8,7 @@
 import warnings
 from collections import OrderedDict
 
+import six
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.module_loading import module_has_submodule

setup.py

@@ -3,7 +3,15 @@
 
 from setuptools import setup
 
-install_requires = ["Django>=1.11", "six"]
+try:
+    from setuptools import setup
+except ImportError:
+    from ez_setup import use_setuptools
+
+    use_setuptools()
+    from setuptools import setup
+
+install_requires = ["Django>=1.11", "six>=1.12.0"]
 
 tests_require = [
     "pysolr>=3.7.0",

test_haystack/test_indexes.py

@@ -7,7 +7,7 @@
 from threading import Thread
 
 from django.test import TestCase
-from django.utils.six.moves import queue
+from six.moves import queue
 from test_haystack.core.models import (
     AFifthMockModel,
     AnotherMockModel,
@@ -17,7 +17,7 @@
     MockModel,
 )
 
-from haystack import connection_router, connections, indexes
+from haystack import connections, indexes
 from haystack.exceptions import SearchFieldError
 from haystack.utils.loading import UnifiedIndex
 

test_haystack/test_views.py

@@ -9,7 +9,7 @@
 from django.http import HttpRequest, QueryDict
 from django.test import TestCase, override_settings
 from django.urls import reverse
-from django.utils.six.moves import queue
+from six.moves import queue
 from test_haystack.core.models import AnotherMockModel, MockModel
 
 from haystack import connections, indexes