From 52e4213096eba07ce71c14f36135172ea4c4a192 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Thu, 13 Feb 2020 16:58:29 +0000 Subject: 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. --- src/virtualenv/activation/python/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/virtualenv/activation/python') diff --git a/src/virtualenv/activation/python/__init__.py b/src/virtualenv/activation/python/__init__.py index 1376243..8736791 100644 --- a/src/virtualenv/activation/python/__init__.py +++ b/src/virtualenv/activation/python/__init__.py @@ -3,10 +3,9 @@ from __future__ import absolute_import, unicode_literals import os from collections import OrderedDict -import six - from virtualenv.info import WIN_CPYTHON_2 from virtualenv.util.path import Path +from virtualenv.util.six import ensure_text from ..via_template import ViaTemplateActivator @@ -20,7 +19,7 @@ class PythonActivator(ViaTemplateActivator): lib_folders = OrderedDict((os.path.relpath(str(i), str(dest_folder)), None) for i in creator.libs) replacements.update( { - "__LIB_FOLDERS__": six.ensure_text(os.pathsep.join(lib_folders.keys())), + "__LIB_FOLDERS__": ensure_text(os.pathsep.join(lib_folders.keys())), "__DECODE_PATH__": ("yes" if WIN_CPYTHON_2 else ""), } ) @@ -30,5 +29,5 @@ class PythonActivator(ViaTemplateActivator): def _repr_unicode(creator, value): py2 = creator.interpreter.version_info.major == 2 if py2: # on Python 2 we need to encode this into explicit utf-8, py3 supports unicode literals - value = six.ensure_text(repr(value.encode("utf-8"))[1:-1]) + value = ensure_text(repr(value.encode("utf-8"))[1:-1]) return value -- cgit v1.2.1