diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-07 12:15:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 12:15:49 +0200 |
| commit | b6300742d2063373b1bf1adee03a97dd3190f069 (patch) | |
| tree | f191c5ab750e22523dd5a9ffd1c00d25e2f21c45 | |
| parent | e83845285cf38954f79abc5b6e2cef019556e301 (diff) | |
| parent | a8f9d5679636a1b745dbd45423d1282df6c65c1b (diff) | |
| download | rneovim-b6300742d2063373b1bf1adee03a97dd3190f069.tar.gz rneovim-b6300742d2063373b1bf1adee03a97dd3190f069.tar.bz2 rneovim-b6300742d2063373b1bf1adee03a97dd3190f069.zip | |
Merge #5444 from malept/dont-hardcode-python3-in-checkhealth
Fix Python 2/3 health checks
| -rw-r--r-- | runtime/autoload/health/provider.vim | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 8fa281e7e3..aadb2688b7 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -100,13 +100,6 @@ function! s:version_info(python) abort \ 'import neovim; print(neovim.__file__)', \ '2>/dev/null'])) - let nvim_path = s:trim(system([ - \ 'python3', - \ '-c', - \ 'import neovim; print(neovim.__file__)' - \ ])) - " \ '2>/dev/null'])) - if empty(nvim_path) return [python_version, 'unable to find neovim executable', pypi_version, 'unable to get neovim executable'] endif @@ -148,7 +141,7 @@ endfunction function! s:check_python(version) abort call health#report_start('Python ' . a:version . ' provider') - let python_bin_name = 'python'.(a:version == 2 ? '2' : '3') + let python_bin_name = 'python'.(a:version == 2 ? '' : '3') let pyenv = resolve(exepath('pyenv')) let pyenv_root = exists('$PYENV_ROOT') ? resolve($PYENV_ROOT) : 'n' let venv = exists('$VIRTUAL_ENV') ? resolve($VIRTUAL_ENV) : '' |