diff options
| author | James McCoy <jamessan@jamessan.com> | 2019-01-02 11:05:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 11:05:13 -0500 |
| commit | 5fba8159213e7821d16cdbea379cb49ac8a6ee74 (patch) | |
| tree | 7c0994cb0367bc8beb2cf33c6974c941de45821c /runtime/autoload/provider/pythonx.vim | |
| parent | 8f288698e4730f6cc91240fe899e93921aff9d71 (diff) | |
| parent | d7b3ac029c302ef3524d3bca96fc2f401eb83dab (diff) | |
| download | rneovim-5fba8159213e7821d16cdbea379cb49ac8a6ee74.tar.gz rneovim-5fba8159213e7821d16cdbea379cb49ac8a6ee74.tar.bz2 rneovim-5fba8159213e7821d16cdbea379cb49ac8a6ee74.zip | |
Merge pull request #9438 from jamessan/revert-pynvim
Rework Python provider/health check to use neovim module again
Diffstat (limited to 'runtime/autoload/provider/pythonx.vim')
| -rw-r--r-- | runtime/autoload/provider/pythonx.vim | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim index b8e2ded00d..05b04e7e2c 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 pynvim; pynvim.start_host()'] + let args = [prog, '-c', 'import sys; sys.path.remove(""); import neovim; neovim.start_host()'] " Collect registered Python plugins into args let python_plugins = remote#host#PluginsForHost(a:host.name) @@ -40,7 +40,7 @@ function! provider#pythonx#Detect(major_ver) abort let errors = [] for prog in progs - let [result, err] = provider#pythonx#CheckForModule(prog, 'pynvim', a:major_ver) + let [result, err] = provider#pythonx#CheckForModule(prog, 'neovim', a:major_ver) if result return [prog, err] endif @@ -75,12 +75,12 @@ function! provider#pythonx#CheckForModule(prog, module, major_version) abort let min_version = (a:major_version == 2) ? '2.6' : '3.3' - " Try to load pynvim module, and output Python version. + " Try to load module, and output Python version. " Exit codes: - " 0 pynvim module can be loaded. - " 2 pynvim module cannot be loaded. + " 0 module can be loaded. + " 2 module cannot be loaded. " Otherwise something else went wrong (e.g. 1 or 127). - let [prog_exitcode, prog_version] = s:import_module(a:prog, 'pynvim') + let [prog_exitcode, prog_version] = s:import_module(a:prog, a:module) if prog_exitcode == 2 || prog_exitcode == 0 " Check version only for expected return codes. @@ -94,7 +94,7 @@ function! provider#pythonx#CheckForModule(prog, module, major_version) abort endif if prog_exitcode == 2 - return [0, prog_path.' does not have the "pynvim" module. :help provider-python'] + return [0, prog_path.' does not have the "' . a:module . '" module. :help provider-python'] elseif prog_exitcode == 127 " This can happen with pyenv's shims. return [0, prog_path . ' does not exist: ' . prog_version] |