From 68a3c75eb2a7096a7d5b3cfa6a6f3a5b894a1d72 Mon Sep 17 00:00:00 2001 From: David Lukes Date: Fri, 8 May 2020 15:13:54 +0200 Subject: [PATCH 1/1] Make sure sys._base_executable is sane in Vim plugin (#1380) The `venv` module relies on `sys._base_executable` to determine the Python executable to run, but with recent versions of Vim, this is set to the `vim` executable. A possible workaround is to just override it, since the `black` plugin already overrides `sys.executable` (possibly for similar reasons?) anyway. --- plugin/black.vim | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugin/black.vim b/plugin/black.vim index 9978e6c..f3e4409 100644 --- a/plugin/black.vim +++ b/plugin/black.vim @@ -110,13 +110,23 @@ def _initialize_black_env(upgrade=False): if not virtualenv_path.is_dir(): print('Please wait, one time setup for Black.') _executable = sys.executable + _base_executable = getattr(sys, "_base_executable", _executable) try: - sys.executable = str(_get_python_binary(Path(sys.exec_prefix))) + executable = str(_get_python_binary(Path(sys.exec_prefix))) + sys.executable = executable + sys._base_executable = executable print(f'Creating a virtualenv in {virtualenv_path}...') print('(this path can be customized in .vimrc by setting g:black_virtualenv)') venv.create(virtualenv_path, with_pip=True) + except Exception: + print('Encountered exception while creating virtualenv (see traceback below).') + print(f'Removing {virtualenv_path}...') + import shutil + shutil.rmtree(virtualenv_path) + raise finally: sys.executable = _executable + sys._base_executable = _base_executable first_install = True if first_install: print('Installing Black with pip...') -- 2.39.5