45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
diff --git a/jedi_vim.py b/jedi_vim.py
|
|
index 35df53a..6ae03f8 100644
|
|
--- a/jedi_vim.py
|
|
+++ b/jedi_vim.py
|
|
@@ -6,12 +6,15 @@ with VIM.
|
|
import traceback # for exception output
|
|
import re
|
|
import os
|
|
+import sys
|
|
from shlex import split as shsplit
|
|
|
|
import vim
|
|
import jedi
|
|
-import jedi.keywords
|
|
-from jedi._compatibility import unicode, is_py3k
|
|
+
|
|
+is_py3 = sys.version_info[0] >= 3
|
|
+if is_py3:
|
|
+ unicode = str
|
|
|
|
|
|
def catch_and_print_exceptions(func):
|
|
@@ -62,7 +65,7 @@ class PythonToVimStr(unicode):
|
|
""" Vim has a different string implementation of single quotes """
|
|
__slots__ = []
|
|
def __new__(cls, obj, encoding='UTF-8'):
|
|
- if is_py3k or isinstance(obj, unicode):
|
|
+ if is_py3 or isinstance(obj, unicode):
|
|
return unicode.__new__(cls, obj)
|
|
else:
|
|
return unicode.__new__(cls, obj, encoding)
|
|
@@ -468,6 +471,12 @@ def escape_file_path(path):
|
|
def print_to_stdout(level, str_out):
|
|
print(str_out)
|
|
|
|
-if not hasattr(jedi, '__version__') or jedi.__version__ < (0, 7, 0):
|
|
+
|
|
+version = jedi.__version__
|
|
+if isinstance(version, str):
|
|
+ # the normal use case, now.
|
|
+ from jedi import utils
|
|
+ version = utils.version_info()
|
|
+if version < (0, 7):
|
|
echo_highlight('Please update your Jedi version, it is to old.')
|
|
|