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

provider/pythonx: only call system("python") once

Browse Source 
`s:check_interpreter` will query/return the version also, so that
`s:check_version` can just use that, without calling "python" again.
This commit is contained in:
Daniel Hahler 2015-05-01 04:28:54 +02:00 committed by Florian Walch
parent 232c40b40a
commit 75db0c37a7
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ function! provider#pythonx#Detect(ver) abort
let skip = exists(skip_var) ? {skip_var} : 0 let skip = exists(skip_var) ? {skip_var} : 0
if exists(host_var) if exists(host_var)
" Disable auto detection " Disable auto detection
let [check, err] = s:check_interpreter({host_var}, a:ver, skip) let [check, err, _] = s:check_interpreter({host_var}, a:ver, skip)
return check ? [{host_var}, err] : ['', err] return check ? [{host_var}, err] : ['', err]
endif endif
@ -22,9 +22,9 @@ function! provider#pythonx#Detect(ver) abort
\ : ['3.5', '3.4', '3.3', '3.2', '3', ''] \ : ['3.5', '3.4', '3.3', '3.2', '3', '']
for prog in map(detect_versions, "'python' . v:val") for prog in map(detect_versions, "'python' . v:val")
let [check, err] = s:check_interpreter(prog, a:ver, skip) let [check, err, ver] = s:check_interpreter(prog, a:ver, skip)
if check if check
let [check, err] = s:check_version(prog, a:ver, skip) let [check, err] = s:check_version(prog, ver, skip)
return [prog, err] return [prog, err]
endif endif
endfor endfor
@ -39,31 +39,30 @@ function! s:check_version(prog, ver, skip) abort
return [1, ''] return [1, '']
endif endif
let get_version = let min_version = (a:ver[0] == 2) ? '2.6' : '3.3'
\ ' -c "import sys; sys.stdout.write(str(sys.version_info[0]) + '. if a:ver >= min_version
\ '\".\" + str(sys.version_info[1]))"'
let min_version = (a:ver == 2) ? '2.6' : '3.3'
if system(a:prog . get_version) >= min_version
return [1, ''] return [1, '']
endif endif
return [0, 'Python ' . get_version . ' interpreter is not supported.'] return [0, 'Python ' . a:ver . ' interpreter is not supported.']
endfunction endfunction
function! s:check_interpreter(prog, ver, skip) abort function! s:check_interpreter(prog, ver, skip) abort
if !executable(a:prog) if !executable(a:prog)
return [0, 'Python'.a:ver.' interpreter is not executable.'] return [0, 'Python'.a:ver.' interpreter is not executable.', '']
endif endif
if a:skip if a:skip
return [1, ''] return [1, '', '']
endif endif
" Load neovim module check " Load neovim module check
call system(a:prog . ' -c ' . let ver = system(a:prog . ' -c ' .
\ '''import sys; sys.stdout.write(str(sys.version_info[0]) + '.
\ '"." + str(sys.version_info[1])); '''.
\ (a:ver == 2 ? \ (a:ver == 2 ?
\ '''import pkgutil; exit(pkgutil.get_loader("neovim") is None)''': \ '''import pkgutil; exit(pkgutil.get_loader("neovim") is None)''':
\ '''import importlib; exit(importlib.find_loader("neovim") is None)''') \ '''import importlib; exit(importlib.find_loader("neovim") is None)''')
\ ) \ )
return [!v:shell_error, 'Python'.a:ver.' interpreter have not neovim module.'] return [!v:shell_error, 'Python'.a:ver.' interpreter have not neovim module.', ver]
endfunction endfunction