Merge pull request #3331 from yagebu/python-no-cwd-import

python: remove current working directory from path
This commit is contained in:
Justin M. Keyes 2015-09-14 08:55:36 -04:00
commit 6bcbb18dc8
2 changed files with 2 additions and 2 deletions

View File

@ -54,7 +54,7 @@ function! s:check_interpreter(prog, major_ver, skip) abort
" Try to load neovim module, and output Python version. " Try to load neovim module, and output Python version.
let prog_ver = system([ a:prog , '-c' , let prog_ver = system([ a:prog , '-c' ,
\ 'import sys; sys.stdout.write(str(sys.version_info[0]) + '. \ 'import sys; sys.path.remove(""); sys.stdout.write(str(sys.version_info[0]) + '.
\ '"." + str(sys.version_info[1])); '. \ '"." + str(sys.version_info[1])); '.
\ (a:major_ver == 2 \ (a:major_ver == 2
\ ? 'import pkgutil; exit(pkgutil.get_loader("neovim") is None)' \ ? 'import pkgutil; exit(pkgutil.get_loader("neovim") is None)'

View File

@ -197,7 +197,7 @@ function! s:RequirePythonHost(host)
let ver = (a:host.orig_name ==# 'python') ? 2 : 3 let ver = (a:host.orig_name ==# 'python') ? 2 : 3
" Python host arguments " Python host arguments
let args = ['-c', 'import neovim; neovim.start_host()'] let args = ['-c', 'import sys; sys.path.remove(""); import neovim; neovim.start_host()']
" Collect registered Python plugins into args " Collect registered Python plugins into args
let python_plugins = remote#host#PluginsForHost(a:host.name) let python_plugins = remote#host#PluginsForHost(a:host.name)