actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure sys._base_executable is sane in Vim plugin (#1380)

Browse Source 
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.
This commit is contained in:
David Lukes 2020-05-08 15:13:54 +02:00 committed by GitHub
parent 1d3fb871be
commit 68a3c75eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugin/black.vim
View File

@ -110,13 +110,23 @@ def _initialize_black_env(upgrade=False):
if not virtualenv_path.is_dir(): if not virtualenv_path.is_dir():
print('Please wait, one time setup for Black.') print('Please wait, one time setup for Black.')
_executable = sys.executable _executable = sys.executable
_base_executable = getattr(sys, "_base_executable", _executable)
try: 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(f'Creating a virtualenv in {virtualenv_path}...')
print('(this path can be customized in .vimrc by setting g:black_virtualenv)') print('(this path can be customized in .vimrc by setting g:black_virtualenv)')
venv.create(virtualenv_path, with_pip=True) 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: finally:
sys.executable = _executable sys.executable = _executable
sys._base_executable = _base_executable
first_install = True first_install = True
if first_install: if first_install:
print('Installing Black with pip...') print('Installing Black with pip...')