From 153e6835f17e8609512ef51f0de39d35585412df Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Thu, 6 Oct 2016 19:42:19 -0400 Subject: [PATCH 1/2] health: remove duplicate nvim_path declaration It's the same as the declaration above it, but hardcoded to use python3 and does not redirect stderr. --- runtime/autoload/health/provider.vim | 7 ------- 1 file changed, 7 deletions(-) diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 8fa281e7e3..38b23b2997 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 From a8f9d5679636a1b745dbd45423d1282df6c65c1b Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Thu, 6 Oct 2016 22:03:04 -0700 Subject: [PATCH 2/2] health: fix Python 2 variable names --- runtime/autoload/health/provider.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 38b23b2997..aadb2688b7 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -141,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) : ''