VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix isues with Python 2.7 running a 3.6 env

Browse Source
This commit is contained in:
Dave Halter
2018-12-16 15:53:42 +01:00
parent ba0d71bef1
commit f55da1e1d6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate/__init__.py
View File

@@ -151,16 +151,16 @@ class Evaluator(object):
@property @property
@evaluator_function_cache() @evaluator_function_cache()
def builtins_module(self): def builtins_module(self):
module_name = 'builtins' module_name = u'builtins'
if self.environment.version_info.major == 2: if self.environment.version_info.major == 2:
module_name = '__builtin__' module_name = u'__builtin__'
builtins_module, = self.import_module((module_name,), sys_path=()) builtins_module, = self.import_module((module_name,), sys_path=())
return builtins_module return builtins_module
@property @property
@evaluator_function_cache() @evaluator_function_cache()
def typing_module(self): def typing_module(self):
typing_module, = self.import_module(('typing',)) typing_module, = self.import_module((u'typing',))
return typing_module.stub_context return typing_module.stub_context
def reset_recursion_limitations(self): def reset_recursion_limitations(self):

2
jedi/evaluate/syntax_tree.py
View File

@@ -520,7 +520,7 @@ def _eval_comparison_part(evaluator, context, left, operator, right):
message % (left, right)) message % (left, right))
result = ContextSet([left, right]) result = ContextSet([left, right])
debug.dbg('Used operator %s resulting in %s', result) debug.dbg('Used operator %s resulting in %s', operator, result)
return result return result

4
test/test_evaluate/test_compiled.py
View File

@@ -20,7 +20,7 @@ def test_simple(evaluator, environment):
def test_builtin_loading(evaluator): def test_builtin_loading(evaluator):
string, = evaluator.builtins_module.py__getattribute__(u'str') string, = evaluator.builtins_module.py__getattribute__(u'str')
from_name, = string.py__getattribute__('__init__') from_name, = string.py__getattribute__(u'__init__')
assert from_name.tree_node assert from_name.tree_node
assert from_name.py__doc__() assert from_name.py__doc__()
@@ -48,7 +48,7 @@ def test_doc(evaluator):
""" """
str_ = compiled.create_simple_object(evaluator, u'') str_ = compiled.create_simple_object(evaluator, u'')
# Equals `''.__getnewargs__` # Equals `''.__getnewargs__`
obj, = str_.py__getattribute__('__getnewargs__') obj, = str_.py__getattribute__(u'__getnewargs__')
assert obj.py__doc__() == '' assert obj.py__doc__() == ''