diff options
Diffstat (limited to 'src/virtualenv/interpreters/create')
7 files changed, 11 insertions, 8 deletions
diff --git a/src/virtualenv/interpreters/create/cpython/common.py b/src/virtualenv/interpreters/create/cpython/common.py index 89a91c6..b5796de 100644 --- a/src/virtualenv/interpreters/create/cpython/common.py +++ b/src/virtualenv/interpreters/create/cpython/common.py @@ -6,7 +6,7 @@ from os import X_OK, access, chmod import six from virtualenv.interpreters.create.via_global_ref import ViaGlobalRef -from virtualenv.util import Path, copy, ensure_dir, symlink +from virtualenv.util.path import Path, copy, ensure_dir, symlink @six.add_metaclass(abc.ABCMeta) diff --git a/src/virtualenv/interpreters/create/cpython/cpython2.py b/src/virtualenv/interpreters/create/cpython/cpython2.py index 7c79158..e41abbb 100644 --- a/src/virtualenv/interpreters/create/cpython/cpython2.py +++ b/src/virtualenv/interpreters/create/cpython/cpython2.py @@ -4,7 +4,7 @@ import abc import six -from virtualenv.util import Path, copy +from virtualenv.util.path import Path, copy from .common import CPython, CPythonPosix, CPythonWindows diff --git a/src/virtualenv/interpreters/create/cpython/cpython3.py b/src/virtualenv/interpreters/create/cpython/cpython3.py index b14ce0a..4d833b4 100644 --- a/src/virtualenv/interpreters/create/cpython/cpython3.py +++ b/src/virtualenv/interpreters/create/cpython/cpython3.py @@ -4,7 +4,7 @@ import abc import six -from virtualenv.util import Path, copy +from virtualenv.util.path import Path, copy from .common import CPython, CPythonPosix, CPythonWindows diff --git a/src/virtualenv/interpreters/create/creator.py b/src/virtualenv/interpreters/create/creator.py index b917a37..fa3caa0 100644 --- a/src/virtualenv/interpreters/create/creator.py +++ b/src/virtualenv/interpreters/create/creator.py @@ -13,7 +13,8 @@ from six import add_metaclass from virtualenv.info import IS_WIN from virtualenv.pyenv_cfg import PyEnvCfg -from virtualenv.util import Path, run_cmd +from virtualenv.util.path import Path +from virtualenv.util.subprocess import run_cmd from virtualenv.version import __version__ HERE = Path(__file__).absolute().parent @@ -104,6 +105,7 @@ class Creator(object): def run(self): if self.dest_dir.exists() and self.clear: + logging.debug("delete %s", self.dest_dir) shutil.rmtree(str(self.dest_dir), ignore_errors=True) self.create() self.set_pyenv_cfg() diff --git a/src/virtualenv/interpreters/create/debug.py b/src/virtualenv/interpreters/create/debug.py index 37f1a45..d9f6d52 100644 --- a/src/virtualenv/interpreters/create/debug.py +++ b/src/virtualenv/interpreters/create/debug.py @@ -7,8 +7,8 @@ def encode_path(value): return None if isinstance(value, bytes): return value.decode(sys.getfilesystemencoding()) - if isinstance(value, type): - return repr(value) + elif not isinstance(value, str): + return repr(value if isinstance(value, type) else type(value)) return value diff --git a/src/virtualenv/interpreters/create/venv.py b/src/virtualenv/interpreters/create/venv.py index e80a45e..feb160b 100644 --- a/src/virtualenv/interpreters/create/venv.py +++ b/src/virtualenv/interpreters/create/venv.py @@ -5,7 +5,7 @@ from copy import copy from virtualenv.error import ProcessCallFailed from virtualenv.interpreters.discovery.py_info import CURRENT -from virtualenv.util import run_cmd +from virtualenv.util.subprocess import run_cmd from .via_global_ref import ViaGlobalRef @@ -41,7 +41,7 @@ class Venv(ViaGlobalRef): def create_via_sub_process(self): cmd = self.get_host_create_cmd() - logging.info("create with venv %s", " ".join(cmd)) + logging.info("using host built-in venv to create via %s", " ".join(cmd)) code, out, err = run_cmd(cmd) if code != 0: raise ProcessCallFailed(code, out, err, cmd) diff --git a/src/virtualenv/interpreters/create/via_global_ref.py b/src/virtualenv/interpreters/create/via_global_ref.py index e574cbd..240b313 100644 --- a/src/virtualenv/interpreters/create/via_global_ref.py +++ b/src/virtualenv/interpreters/create/via_global_ref.py @@ -27,6 +27,7 @@ class ViaGlobalRef(Creator): ) group.add_argument( "--copies", + "--always-copy", default=not symlink, action="store_false", dest="symlinks", |