Merge pull request #50 from equalsraf/tb-python3-fixes

python3 fixes for find_module, long, unicode

Author: tarruda

neovim/compat.py

@@ -1,6 +1,36 @@
 """Code for supporting compatibility across python versions."""
 
 import sys
+from imp import find_module as original_find_module
 
 
 IS_PYTHON3 = sys.version_info >= (3, 0)
+
+
+if IS_PYTHON3:
+    def find_module(fullname, path):
+        """Compatibility wrapper for imp.find_module.
+
+        Automatically decodes arguments of find_module, in Python3
+        they must be Unicode
+        """
+        if isinstance(fullname, bytes):
+            fullname = fullname.decode()
+        if isinstance(path, bytes):
+            path = path.decode()
+        elif isinstance(path, list):
+            newpath = []
+            for element in path:
+                if isinstance(element, bytes):
+                    newpath.append(element.decode())
+                else:
+                    newpath.append(element)
+            path = newpath
+        return original_find_module(fullname, path)
+
+    # There is no 'long' type in Python3 just int
+    long = int
+else:
+    find_module = original_find_module
+
+NUM_TYPES = (int, long, float)

neovim/plugins/plugin_host.py

@@ -3,10 +3,10 @@
 import os
 import os.path
 import sys
-from imp import find_module, load_module
+from imp import load_module
 from traceback import format_exc
 
-from ..compat import IS_PYTHON3
+from ..compat import IS_PYTHON3, find_module
 
 
 logger = logging.getLogger(__name__)

neovim/plugins/script_host.py

@@ -2,8 +2,8 @@
 import logging
 import sys
 
-from ..api.common import SessionHook
-from ..compat import IS_PYTHON3
+from ..api.common import SessionHook, DecodeHook
+from ..compat import NUM_TYPES, IS_PYTHON3
 
 
 logger = logging.getLogger(__name__)
@@ -26,6 +26,8 @@ def __init__(self, nvim):
         # it seems some plugins assume 'sys' is already imported, so do it now
         exec('import sys', self.module.__dict__)
         sys.modules['vim'] = nvim.with_hook(LegacyEvalHook())
+        if IS_PYTHON3:
+            sys.modules['vim'] = sys.modules['vim'].with_hook(DecodeHook(encoding=nvim.options['encoding'].decode('ascii')))
 
     def python_execute(self, script):
         exec(script, self.module.__dict__)
@@ -98,6 +100,6 @@ def __init__(self):
         super(LegacyEvalHook, self).__init__(from_nvim=self._string_eval)
 
     def _string_eval(self, obj, session, method, kind):
-        if method == 'vim_eval' and isinstance(obj, (int, long, float)):
+        if method == 'vim_eval' and isinstance(obj, NUM_TYPES):
             return str(obj)
         return obj