Skip to content

Commit

Permalink
fix Windows pypy3
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborbernat committed Jan 17, 2020
1 parent 9d70764 commit da07320
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
17 changes: 8 additions & 9 deletions src/virtualenv/interpreters/create/venv.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

class Venv(ViaGlobalRefApi):
def __init__(self, options, interpreter):
self.builtin_way = options.builtin_way
super(Venv, self).__init__(options, interpreter)
self.can_be_inline = interpreter is CURRENT and interpreter.executable == interpreter.system_executable
self._context = None
self.builtin_way = options.builtin_way

def _args(self):
return super(Venv, self)._args() + (
Expand Down Expand Up @@ -65,11 +65,10 @@ def set_pyenv_cfg(self):
super(Venv, self).set_pyenv_cfg()
self.pyenv_cfg.update(venv_content)

def _proxy_builtin_way(self, key):
if self.builtin_way is None:
return None
return getattr(self.builtin_way, key)

@property
def exe(self):
return self._proxy_builtin_way("exe")
def __getattribute__(self, item):
builtin = object.__getattribute__(self, "builtin_way")
if builtin is not None and hasattr(builtin, item):
element = getattr(builtin, item)
if not callable(element):
return element
return object.__getattribute__(self, item)
3 changes: 3 additions & 0 deletions src/virtualenv/pyenv_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ def __contains__(self, item):
def update(self, other):
self.content.update(other)
return self

def __repr__(self):
return "{}(path={})".format(self.__class__.__name__, self.path)
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ def test_base_bootstrap_link_via_app_data(tmp_path, coverage_env, mocker):
files_post_first_create = list(site_package.iterdir())
assert pip in files_post_first_create
assert setuptools in files_post_first_create

env_exe = result.creator.exe
for pip_exe in [
env_exe.with_name("pip{}{}".format(suffix, env_exe.suffix))
result.creator.script_dir / "pip{}{}".format(suffix, result.creator.exe.suffix)
for suffix in (
"",
"{}".format(CURRENT.version_info.major),
Expand All @@ -61,7 +59,7 @@ def test_base_bootstrap_link_via_app_data(tmp_path, coverage_env, mocker):
assert not process.returncode

remove_cmd = [
str(env_exe),
str(result.creator.exe),
"-m",
"pip",
"--verbose",
Expand Down

0 comments on commit da07320

Please sign in to comment.