Lower min version of six to 1.9 (#1606)

This change should allow installation of virtualenv on systems
with older six where their LTS support may prevent them from
upgrading it.

4 files changed, 9 insertions, 12 deletions

diff --git a/src/virtualenv/discovery/builtin.py b/src/virtualenv/discovery/builtin.py
index c5f4883..fc8eca3 100644
--- a/src/virtualenv/discovery/builtin.py
+++ b/src/virtualenv/discovery/builtin.py
@@ -4,9 +4,8 @@ import logging
 import os
 import sys
 
-import six
-
 from virtualenv.info import IS_WIN
+from virtualenv.util.six import ensure_str, ensure_text
 
 from .discover import Discover
 from .py_info import PythonInfo
@@ -33,7 +32,7 @@ class Builtin(Discover):
         return get_interpreter(self.python_spec)
 
     def __repr__(self):
-        return six.ensure_str(self.__unicode__())
+        return ensure_str(self.__unicode__())
 
     def __unicode__(self):
         return "{} discover of python_spec={!r}".format(self.__class__.__name__, self.python_spec)
@@ -73,7 +72,7 @@ def propose_interpreters(spec):
     # find on path, the path order matters (as the candidates are less easy to control by end user)
     tested_exes = set()
     for pos, path in enumerate(paths):
-        path = six.ensure_text(path)
+        path = ensure_text(path)
         logging.debug(LazyPathDump(pos, path))
         for candidate, match in possible_specs(spec):
             found = check_path(candidate, path)
@@ -106,7 +105,7 @@ class LazyPathDump(object):
         self.path = path
 
     def __repr__(self):
-        return six.ensure_str(self.__unicode__())
+        return ensure_str(self.__unicode__())
 
     def __unicode__(self):
         content = "discover PATH[{}]={}".format(self.pos, self.path)
diff --git a/src/virtualenv/discovery/cached_py_info.py b/src/virtualenv/discovery/cached_py_info.py
index 7e28018..29b34f8 100644
--- a/src/virtualenv/discovery/cached_py_info.py
+++ b/src/virtualenv/discovery/cached_py_info.py
@@ -14,12 +14,11 @@ import sys
 from collections import OrderedDict
 from hashlib import sha256
 
-from six import ensure_text
-
 from virtualenv.dirs import default_data_dir
 from virtualenv.discovery.py_info import PythonInfo
 from virtualenv.info import PY2, PY3
 from virtualenv.util.path import Path
+from virtualenv.util.six import ensure_text
 from virtualenv.util.subprocess import Popen, subprocess
 from virtualenv.util.zipapp import ensure_file_on_disk
 from virtualenv.version import __version__
diff --git a/src/virtualenv/discovery/discover.py b/src/virtualenv/discovery/discover.py
index 17d404e..93c3ea7 100644
--- a/src/virtualenv/discovery/discover.py
+++ b/src/virtualenv/discovery/discover.py
@@ -2,10 +2,10 @@ from __future__ import absolute_import, unicode_literals
 
 from abc import ABCMeta, abstractmethod
 
-import six
+from six import add_metaclass
 
 
-@six.add_metaclass(ABCMeta)
+@add_metaclass(ABCMeta)
 class Discover(object):
     """Discover and provide the requested Python interpreter"""
 
diff --git a/src/virtualenv/discovery/py_spec.py b/src/virtualenv/discovery/py_spec.py
index ac92c3b..fc9f100 100644
--- a/src/virtualenv/discovery/py_spec.py
+++ b/src/virtualenv/discovery/py_spec.py
@@ -6,9 +6,8 @@ import re
 import sys
 from collections import OrderedDict
 
-import six
-
 from virtualenv.info import fs_is_case_sensitive
+from virtualenv.util.six import ensure_str
 
 PATTERN = re.compile(r"^(?P<impl>[a-zA-Z]+)?(?P<version>[0-9.]+)?(?:-(?P<arch>32|64))?$")
 IS_WIN = sys.platform == "win32"
@@ -120,4 +119,4 @@ class PythonSpec(object):
         )
 
     def __repr__(self):
-        return six.ensure_str(self.__unicode__())
+        return ensure_str(self.__unicode__())