Merge pull request #364 from justinmk/avoid-deprecated

Author: justinmk

README.md

@@ -56,13 +56,23 @@ See the [Python Plugin API](http://pynvim.readthedocs.io/en/latest/usage/python-
 
 #### Development
 
-If you change the code, you need to run
-```sh
-pip2 install .
-pip3 install .
-```
-for the changes to have effect. For instructions of testing and troubleshooting,
-see the [development](http://pynvim.readthedocs.io/en/latest/development.html) documentation.
+Use (and activate) a local virtualenv.
+
+    python3 -m venv env36
+    source env36/bin/activate
+
+If you change the code, you must reinstall for the changes to take effect:
+
+    pip install .
+
+Use `pytest` to run the tests. Invoking with `python -m` prepends the current
+directory to `sys.path` (otherwise `pytest` might find other versions!):
+
+    python -m pytest
+
+For details about testing and troubleshooting, see the
+[development](http://pynvim.readthedocs.io/en/latest/development.html)
+documentation.
 
 #### Usage through the python REPL
 

docs/development.rst

@@ -19,9 +19,11 @@ in order for Neovim to use it for the plugin host.
 
 To run the tests execute::
 
-    pytest
+    python -m pytest
+
+This will run the tests in an embedded instance of Neovim, with the current
+directory added to ``sys.path``.
 
-This will run the tests in an embedded instance of Neovim.
 If you want to test a different version than ``nvim`` in ``$PATH`` use::
 
     NVIM_CHILD_ARGV='["/path/to/nvim", "-u", "NONE", "--embed"]' pytest
@@ -30,7 +32,7 @@ Alternatively, if you want to see the state of nvim, you could use::
 
     export NVIM_LISTEN_ADDRESS=/tmp/nvimtest
     xterm -e "nvim -u NONE"&
-    pytest
+    python -m pytest
 
 But note you need to restart Neovim every time you run the tests!
 Substitute your favorite terminal emulator for ``xterm``.

pynvim/compat.py

@@ -1,19 +1,33 @@
-"""Code for supporting compatibility across python versions."""
+"""Code for compatibility across Python versions."""
 
 import sys
 import warnings
-from imp import find_module as original_find_module
+if sys.version_info >= (3, 7):
+    import types
+    import importlib
+else:
+    import imp  # Deprecated in Python 3.7+
+if sys.version_info >= (3, 4):
+    from importlib.machinery import PathFinder
+    original_find_module = PathFinder.find_spec
+else:
+    from imp import find_module as original_find_module
 
 
 IS_PYTHON3 = sys.version_info >= (3, 0)
 
+if sys.version_info >= (3, 7):
+    load_module = importlib.import_module
+    new_module = types.ModuleType
+else:
+    load_module = imp.load_module
+    new_module = imp.new_module
 
 if IS_PYTHON3:
     def find_module(fullname, path):
-        """Compatibility wrapper for imp.find_module.
+        """Compat wrapper for imp.find_module, or find_spec in Python 3.7+.
 
-        Automatically decodes arguments of find_module, in Python3
-        they must be Unicode
+        Automatically decodes arguments (must be Unicode in Python3).
         """
         if isinstance(fullname, bytes):
             fullname = fullname.decode()

pynvim/msgpack_rpc/msgpack_stream.py

@@ -20,8 +20,7 @@ class MsgpackStream(object):
     def __init__(self, event_loop):
         """Wrap `event_loop` on a msgpack-aware interface."""
         self.loop = event_loop
-        self._packer = Packer(encoding='utf-8',
-                              unicode_errors=unicode_errors_default)
+        self._packer = Packer(unicode_errors=unicode_errors_default)
         self._unpacker = Unpacker()
         self._message_cb = None
 

pynvim/plugin/script_host.py

@@ -1,12 +1,12 @@
 """Legacy python/python3-vim emulation."""
-import imp
 import io
 import logging
 import os
 import sys
 
 from .decorators import plugin, rpc_export
 from ..api import Nvim, walk
+from ..compat import IS_PYTHON3, find_module, load_module, new_module
 from ..msgpack_rpc import ErrorResponse
 from ..util import format_exc_skip
 
@@ -16,8 +16,6 @@
 logger = logging.getLogger(__name__)
 debug, info, warn = (logger.debug, logger.info, logger.warn,)
 
-IS_PYTHON3 = sys.version_info >= (3, 0)
-
 if IS_PYTHON3:
     basestring = str
 
@@ -38,7 +36,7 @@ def __init__(self, nvim):
         """Initialize the legacy python-vim environment."""
         self.setup(nvim)
         # context where all code will run
-        self.module = imp.new_module('__main__')
+        self.module = new_module('__main__')
         nvim.script_context = self.module
         # it seems some plugins assume 'sys' is already imported, so do it now
         exec('import sys', self.module.__dict__)
@@ -205,7 +203,7 @@ def eval(self, expr):
         return walk(num_to_str, obj)
 
 
-# This was copied/adapted from nvim-python help
+# Copied/adapted from :help if_pyth.
 def path_hook(nvim):
     def _get_paths():
         if nvim._thread_invalid():
@@ -217,11 +215,11 @@ def _find_module(fullname, oldtail, path):
         if idx > 0:
             name = oldtail[:idx]
             tail = oldtail[idx + 1:]
-            fmr = imp.find_module(name, path)
-            module = imp.find_module(fullname[:-len(oldtail)] + name, *fmr)
+            fmr = find_module(name, path)
+            module = find_module(fullname[:-len(oldtail)] + name, *fmr)
             return _find_module(fullname, tail, module.__path__)
         else:
-            return imp.find_module(fullname, path)
+            return find_module(fullname, path)
 
     class VimModuleLoader(object):
         def __init__(self, module):
@@ -233,7 +231,7 @@ def load_module(self, fullname, path=None):
                 return sys.modules[fullname]
             except KeyError:
                 pass
-            return imp.load_module(fullname, *self.module)
+            return load_module(fullname, *self.module)
 
     class VimPathFinder(object):
         @staticmethod