VimPlug/jedi-vim-fork
1
0
Fork 0
forked from VimPlug/jedi-vim
Code Pull Requests Activity

Drop jedi#get_force_py_version again, handle 'auto' once

Browse Source
This commit is contained in:
Daniel Hahler
2015-04-14 20:11:21 +02:00
parent 7784c29a59
commit 0cd664d8f7
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
autoload/jedi.vim
View File

@@ -337,38 +337,38 @@ call s:init()
let s:script_path = fnameescape(expand('<sfile>:p:h:h')) let s:script_path = fnameescape(expand('<sfile>:p:h:h'))
" Get g:jedi#force_py_version, handling "auto" on first call. if g:jedi#force_py_version == 'auto'
function! jedi#get_force_py_version() " Get default python version from interpreter in $PATH.
if g:jedi#force_py_version == 'auto'
let s:def_py = system("python -c 'import sys; sys.stdout.write(str(sys.version_info[0]))'") let s:def_py = system("python -c 'import sys; sys.stdout.write(str(sys.version_info[0]))'")
if v:shell_error == 0 && len(s:def_py) if v:shell_error == 0 && len(s:def_py)
let g:jedi#force_py_version = s:def_py let g:jedi#force_py_version = s:def_py
else else
if !exists("g:jedi#squelch_py_warning") if !exists("g:jedi#squelch_py_warning")
echomsg "Error: jedi-vim failed to get Python version from sys.version_info: " . s:def_py echomsg "Error: jedi-vim failed to get Python version from sys.version_info: " . s:def_py
echomsg "Falling back to version 2."
endif endif
let g:jedi#force_py_version = 2
endif endif
endif
return g:jedi#force_py_version
endfunction
" NOTE: nvim usually has both python providers. Skipping the `has` check if has('nvim') || (has('python') && has('python3'))
" avoids starting both of them. " Neovim usually has both python providers. Skipping the `has` check
if has('nvim') || (has('python') && has('python3')) " avoids starting both of them.
" Use default python with Jedi. call jedi#force_py_version(g:jedi#force_py_version)
call jedi#force_py_version(jedi#get_force_py_version()) elseif has('python')
elseif has('python')
command! -nargs=1 Python python <args> command! -nargs=1 Python python <args>
execute 'pyfile '.s:script_path.'/initialize.py' execute 'pyfile '.s:script_path.'/initialize.py'
elseif has('python3') elseif has('python3')
command! -nargs=1 Python python3 <args> command! -nargs=1 Python python3 <args>
execute 'py3file '.s:script_path.'/initialize.py' execute 'py3file '.s:script_path.'/initialize.py'
else else
if !exists("g:jedi#squelch_py_warning") if !exists("g:jedi#squelch_py_warning")
echomsg "Error: jedi-vim requires vim compiled with +python" echomsg "Error: jedi-vim requires vim compiled with +python"
endif endif
finish finish
endif end
else
call jedi#force_py_version(g:jedi#force_py_version)
end
"Python jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout, speed=True, warnings=False, notices=False) "Python jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout, speed=True, warnings=False, notices=False)