Merge 'upstream/master' into pr-win-erw7

1 files changed, 36 insertions, 29 deletions

diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index b51c398410..b8e2ded00d 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -10,7 +10,7 @@ function! provider#pythonx#Require(host) abort
 
   " Python host arguments
   let prog = (ver == '2' ?  provider#python#Prog() : provider#python3#Prog())
-  let args = [prog, '-c', 'import sys; sys.path.remove(""); import neovim; neovim.start_host()']
+  let args = [prog, '-c', 'import sys; sys.path.remove(""); import pynvim; pynvim.start_host()']
 
   " Collect registered Python plugins into args
   let python_plugins = remote#host#PluginsForHost(a:host.name)
@@ -24,13 +24,13 @@ endfunction
 function! provider#pythonx#Detect(major_ver) abort
   if a:major_ver == 2
     if exists('g:python_host_prog')
-      return [g:python_host_prog, '']
+      return [expand(g:python_host_prog), '']
     else
       let progs = ['python2', 'python2.7', 'python2.6', 'python']
     endif
   else
     if exists('g:python3_host_prog')
-      return [g:python3_host_prog, '']
+      return [expand(g:python3_host_prog), '']
     else
       let progs = ['python3', 'python3.7', 'python3.6', 'python3.5',
             \ 'python3.4', 'python3.3', 'python']
@@ -40,7 +40,7 @@ function! provider#pythonx#Detect(major_ver) abort
   let errors = []
 
   for prog in progs
-    let [result, err] = s:check_interpreter(prog, a:major_ver)
+    let [result, err] = provider#pythonx#CheckForModule(prog, 'pynvim', a:major_ver)
     if result
       return [prog, err]
     endif
@@ -54,46 +54,53 @@ function! provider#pythonx#Detect(major_ver) abort
         \ . ":\n" .  join(errors, "\n")]
 endfunction
 
-function! s:check_interpreter(prog, major_ver) abort
+" Returns array: [prog_exitcode, prog_version]
+function! s:import_module(prog, module) abort
+  let prog_version = system([a:prog, '-c' , printf(
+        \ 'import sys; ' .
+        \ 'sys.path.remove(""); ' .
+        \ 'sys.stdout.write(str(sys.version_info[0]) + "." + str(sys.version_info[1])); ' .
+        \ 'import pkgutil; ' .
+        \ 'exit(2*int(pkgutil.get_loader("%s") is None))',
+        \ a:module)])
+  return [v:shell_error, prog_version]
+endfunction
+
+" Returns array: [was_success, error_message]
+function! provider#pythonx#CheckForModule(prog, module, major_version) abort
   let prog_path = exepath(a:prog)
   if prog_path ==# ''
     return [0, a:prog . ' not found in search path or not executable.']
   endif
 
-  let min_version = (a:major_ver == 2) ? '2.6' : '3.3'
+  let min_version = (a:major_version == 2) ? '2.6' : '3.3'
 
-  " Try to load neovim module, and output Python version.
-  " Return codes:
-  "   0  Neovim module can be loaded.
-  "   2  Neovim module cannot be loaded.
+  " Try to load pynvim module, and output Python version.
+  " Exit codes:
+  "   0  pynvim module can be loaded.
+  "   2  pynvim module cannot be loaded.
   "   Otherwise something else went wrong (e.g. 1 or 127).
-  let prog_ver = system([ a:prog , '-c' ,
-        \ 'import sys; ' .
-        \ 'sys.path.remove(""); ' .
-        \ 'sys.stdout.write(str(sys.version_info[0]) + "." + str(sys.version_info[1])); ' .
-        \ 'import pkgutil; ' .
-        \ 'exit(2*int(pkgutil.get_loader("neovim") is None))'
-        \ ])
+  let [prog_exitcode, prog_version] = s:import_module(a:prog, 'pynvim')
 
-  if v:shell_error == 2 || v:shell_error == 0
+  if prog_exitcode == 2 || prog_exitcode == 0
     " Check version only for expected return codes.
-    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 >= '
+    if prog_version !~ '^' . a:major_version
+      return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python '
+            \ . a:major_version . '.']
+    elseif prog_version =~ '^' . a:major_version && prog_version < min_version
+      return [0, prog_path . ' is Python ' . prog_version . ' and cannot provide Python >= '
             \ . min_version . '.']
     endif
   endif
 
-  if v:shell_error == 2
-    return [0, prog_path.' does not have the "neovim" module. :help provider-python']
-  elseif v:shell_error == 127
+  if prog_exitcode == 2
+    return [0, prog_path.' does not have the "pynvim" module. :help provider-python']
+  elseif prog_exitcode == 127
     " This can happen with pyenv's shims.
-    return [0, prog_path . ' does not exist: ' . prog_ver]
-  elseif v:shell_error
+    return [0, prog_path . ' does not exist: ' . prog_version]
+  elseif prog_exitcode
     return [0, 'Checking ' . prog_path . ' caused an unknown error. '
-          \ . '(' . v:shell_error . ', output: ' . prog_ver . ')'
+          \ . '(' . prog_exitcode . ', output: ' . prog_version . ')'
           \ . ' Report this at https://github.com/neovim/neovim']
   endif