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

isinstance fixes

Browse Source
This commit is contained in:
Dave Halter
2014-11-05 22:14:38 +01:00
parent fa0f4b1e00
commit ca70d32f23
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/evaluate/__init__.py
View File

@@ -197,9 +197,14 @@ class Evaluator(object):
elif pr.is_node(element, 'testlist_star_expr', 'testlist'):
# The implicit tuple in statements.
return [iterable.Array(self, element, pr.Array.TUPLE)]
else:
if element.children[0] == 'not':
left = []
operator, right = element.children
else:
left, operator, right = element.children
return precedence.calculate(self, self.eval_element(left), operator,
left = self.eval_element(left)
return precedence.calculate(self, left, operator,
self.eval_element(right))
def _eval_atom(self, atom):

9
jedi/evaluate/stdlib.py
View File

@@ -164,11 +164,10 @@ def builtins_reversed(evaluator, obj, params):
return [er.Instance(evaluator, obj, objects)]
def builtins_isinstance(evaluator, obj, params):
obj = _follow_param(evaluator, params, 0)
raw_classes = _follow_param(evaluator, params, 1)
@argument_clinic('obj, type, /')
def builtins_isinstance(evaluator, objects, types):
bool_results = set([])
for o in obj:
for o in objects:
try:
mro_func = o.py__class__(evaluator).py__mro__
except AttributeError:
@@ -179,7 +178,7 @@ def builtins_isinstance(evaluator, obj, params):
mro = mro_func(evaluator)
for cls_or_tup in raw_classes:
for cls_or_tup in types:
if cls_or_tup.is_class():
bool_results.add(cls_or_tup in mro)
else: