mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 11:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix python setup: Make sure python version on user's path is picked.

Browse Source 
Problem:  executable() was detecting python on user's path, but
          system() was executing system-level python.

Solution: Make sure python version on user's path is executed.
          Use exepath() to force system() to do so.
This commit is contained in:
Eliseo Martínez
2014-10-29 21:44:21 +01:00
committed by Thiago de Arruda
parent 3fb5cdcb3f
commit f10779fb7a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/plugin/python_setup.vim
View File

@@ -36,21 +36,25 @@ else
finish finish
endif endif
" Make sure we pick correct python version on path.
let s:python_interpreter_path = exepath(s:python_interpreter)
let s:python_version = systemlist(s:python_interpreter_path . ' --version')[0]
" Execute python, import neovim and print a string. If import_result matches " Execute python, import neovim and print a string. If import_result matches
" the printed string, we can probably start the host " the printed string, we can probably start the host
let s:import_result = system(s:python_interpreter . let s:import_result = system(s:python_interpreter_path .
\ ' -c "import neovim, sys; sys.stdout.write(\"ok\")"') \ ' -c "import neovim, sys; sys.stdout.write(\"ok\")"')
if s:import_result != 'ok' if s:import_result != 'ok'
call s:ShowError('No neovim module found') call s:ShowError('No neovim module found for ' . s:python_version)
finish finish
endif endif
let s:pyhost_id = rpcstart(s:python_interpreter, let s:pyhost_id = rpcstart(s:python_interpreter_path,
\ ['-c', 'import neovim; neovim.start_host()']) \ ['-c', 'import neovim; neovim.start_host()'])
" Evaluate an expression in the script host as an additional sanity check, and " Evaluate an expression in the script host as an additional sanity check, and
" to block until all providers have been registered(or else some plugins loaded " to block until all providers have been registered(or else some plugins loaded
" by the user's vimrc would not get has('python') == 1 " by the user's vimrc would not get has('python') == 1
if rpcrequest(s:pyhost_id, 'python_eval', '"o"+"k"') != 'ok' || !has('python') if rpcrequest(s:pyhost_id, 'python_eval', '"o"+"k"') != 'ok' || !has('python')
call s:ShowError('Something went wrong') call s:ShowError('Something went wrong setting up ' . s:python_version)
call rpcstop(s:pyhost_id) call rpcstop(s:pyhost_id)
endif endif