diff options
| author | James McCoy <jamessan@jamessan.com> | 2019-01-01 12:04:41 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2019-01-01 14:15:31 -0500 |
| commit | 0dd89cda9c4794b9ffa66c7d3fb870f8a0957761 (patch) | |
| tree | d9360302490193816882cf0f56dacbb32df9964a | |
| parent | 57e0a578f027fed99c64c1f3c881e5f59e56a8d6 (diff) | |
| download | rneovim-0dd89cda9c4794b9ffa66c7d3fb870f8a0957761.tar.gz rneovim-0dd89cda9c4794b9ffa66c7d3fb870f8a0957761.tar.bz2 rneovim-0dd89cda9c4794b9ffa66c7d3fb870f8a0957761.zip | |
{health,provider}/python: Import the neovim, rather than pynvim, module
The neovim module is available for backwards compatibility. We should
not yet force the use of the pynvim module, since there's no other major
reason to bump the minimum supported Python client module.
Closes #9426
| -rw-r--r-- | runtime/autoload/health/provider.vim | 10 | ||||
| -rw-r--r-- | runtime/autoload/provider/pythonx.vim | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 9cd8b3801b..8f3e261e99 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -192,9 +192,9 @@ function! s:version_info(python) abort let nvim_path = s:trim(s:system([ \ a:python, '-c', \ 'import sys; sys.path.remove(""); ' . - \ 'import pynvim; print(pynvim.__file__)'])) + \ 'import neovim; print(neovim.__file__)'])) if s:shell_error || empty(nvim_path) - return [python_version, 'unable to load pynvim Python module', pypi_version, + return [python_version, 'unable to load neovim Python module', pypi_version, \ nvim_path] endif @@ -206,13 +206,13 @@ function! s:version_info(python) abort return a == b ? 0 : a > b ? 1 : -1 endfunction - " Try to get pynvim.VERSION (added in 0.1.11dev). + " Try to get neovim.VERSION (added in 0.1.11dev). let nvim_version = s:system([a:python, '-c', - \ 'from pynvim import VERSION as v; '. + \ 'from neovim import VERSION as v; '. \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'], \ '', 1, 1) if empty(nvim_version) - let nvim_version = 'unable to find pynvim Python module version' + let nvim_version = 'unable to find neovim Python module version' let base = fnamemodify(nvim_path, ':h') let metas = glob(base.'-*/METADATA', 1, 1) \ + glob(base.'-*/PKG-INFO', 1, 1) diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim index b8e2ded00d..7ba21b03ad 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 |