IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

python: VimPathFinder: use find_spec for Python 3.4

Browse Source 
Fixes https://github.com/neovim/neovim/issues/2909
This commit is contained in:
Daniel Hahler 2015-06-27 16:59:13 +02:00
parent ba2f7a9310
commit 1cc37f32b8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/autoload/provider/script_host.py
View File

@ -17,6 +17,9 @@ IS_PYTHON3 = sys.version_info >= (3, 0)
if IS_PYTHON3: if IS_PYTHON3:
basestring = str basestring = str
if sys.version_info >= (3, 4):
from importlib.machinery import PathFinder
@neovim.plugin @neovim.plugin
class ScriptHost(object): class ScriptHost(object):
@ -212,8 +215,9 @@ def path_hook(nvim):
return self.module return self.module
class VimPathFinder(object): class VimPathFinder(object):
@classmethod @staticmethod
def find_module(cls, fullname, path=None): def find_module(fullname, path=None):
"Method for Python 2.7 and 3.3."
try: try:
return VimModuleLoader( return VimModuleLoader(
_find_module(fullname, fullname, path or _get_paths())) _find_module(fullname, fullname, path or _get_paths()))
@ -224,6 +228,11 @@ def path_hook(nvim):
def load_module(cls, fullname, path=None): def load_module(cls, fullname, path=None):
return _find_module(fullname, fullname, path or _get_paths()) return _find_module(fullname, fullname, path or _get_paths())
@staticmethod
def find_spec(fullname, path=None, target=None):
"Method for Python 3.4+."
return PathFinder.find_spec(fullname, path or _get_paths(), target)
def hook(path): def hook(path):
if path == nvim.VIM_SPECIAL_PATH: if path == nvim.VIM_SPECIAL_PATH:
return VimPathFinder return VimPathFinder