diff --git a/tox.ini b/tox.ini index a597328a8..598317164 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,6 @@ deps = beautifulsoup4>=4.3.2 html5lib==0.999 Unidecode>=0.04.14 - six==1.7.3 elasticsearch==1.1.0 mock==1.0.1 python-dateutil==2.2 diff --git a/wagtail/wagtailsearch/backends/__init__.py b/wagtail/wagtailsearch/backends/__init__.py index c6e20ecae..d3849e192 100644 --- a/wagtail/wagtailsearch/backends/__init__.py +++ b/wagtail/wagtailsearch/backends/__init__.py @@ -3,9 +3,9 @@ # https://github.com/django/django/blob/5d263dee304fdaf95e18d2f0619d6925984a7f02/django/core/cache/__init__.py import sys -import six from importlib import import_module +from django.utils import six from django.utils.module_loading import import_string from django.core.exceptions import ImproperlyConfigured from django.conf import settings diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index e42971d29..27a5efa5e 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -1,9 +1,9 @@ from __future__ import absolute_import import json -import six import warnings +from django.utils import six from django.utils.six.moves.urllib.parse import urlparse from elasticsearch import Elasticsearch, NotFoundError