IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3351 from fwalch/provider/pythonx-error-message

Browse Source 
provider/pythonx: Improve detection code and error messages.
This commit is contained in:
Justin M. Keyes 2015-09-17 13:23:29 -04:00
commit 7befd0f37c
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
runtime/autoload/provider/pythonx.vim
View File

@ -52,24 +52,38 @@ function! s:check_interpreter(prog, major_ver, skip) abort
return [1, ''] return [1, '']
endif endif
let min_version = (a:major_ver == 2) ? '2.6' : '3.3'
" Try to load neovim module, and output Python version. " Try to load neovim module, and output Python version.
" Return codes:
" 0 Neovim module can be loaded.
" 1 Something else went wrong.
" 2 Neovim module cannot be loaded.
let prog_ver = system([ a:prog , '-c' , let prog_ver = system([ a:prog , '-c' ,
\ 'import sys; sys.path.remove(""); sys.stdout.write(str(sys.version_info[0]) + '. \ 'import sys; ' .
\ '"." + str(sys.version_info[1])); '. \ 'sys.path.remove(""); ' .
\ (a:major_ver == 2 \ 'sys.stdout.write(str(sys.version_info[0]) + "." + str(sys.version_info[1])); ' .
\ ? 'import pkgutil; exit(pkgutil.get_loader("neovim") is None)' \ 'import pkgutil; ' .
\ : 'import importlib; exit(importlib.find_loader("neovim") is None)') \ 'exit(2*int(pkgutil.get_loader("neovim") is None))'
\ ]) \ ])
if v:shell_error
if prog_ver
if prog_ver !~ '^' . a:major_ver
return [0, prog_path . ' is Python ' . prog_ver . ' and cannot provide Python '
\ . a:major_ver . '.']
elseif prog_ver =~ '^' . a:major_ver && prog_ver < min_version
return [0, prog_path . ' is Python ' . prog_ver . ' and cannot provide Python >= '
\ . min_version . '.']
endif
endif
if v:shell_error == 1
return [0, 'Checking ' . prog_path . ' caused an unknown error. '
\ . 'Please report this at github.com/neovim/neovim.']
elseif v:shell_error == 2
return [0, prog_path . ' does have not have the neovim module installed. ' return [0, prog_path . ' does have not have the neovim module installed. '
\ . 'See ":help nvim-python".'] \ . 'See ":help nvim-python".']
endif endif
let min_version = (a:major_ver == 2) ? '2.6' : '3.3' return [1, '']
if prog_ver =~ '^' . a:major_ver && prog_ver >= min_version
return [1, '']
endif
return [0, prog_path . ' is Python ' . prog_ver . ' and cannot provide Python '
\ . a:major_ver . '.']
endfunction endfunction