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

9
jedi/evaluate/__init__.py
View File

@@ -198,8 +198,13 @@ class Evaluator(object):
# The implicit tuple in statements. # The implicit tuple in statements.
return [iterable.Array(self, element, pr.Array.TUPLE)] return [iterable.Array(self, element, pr.Array.TUPLE)]
else: else:
left, operator, right = element.children if element.children[0] == 'not':
return precedence.calculate(self, self.eval_element(left), operator, left = []
operator, right = element.children
else:
left, operator, right = element.children
left = self.eval_element(left)
return precedence.calculate(self, left, operator,
self.eval_element(right)) self.eval_element(right))
def _eval_atom(self, atom): 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)] return [er.Instance(evaluator, obj, objects)]
def builtins_isinstance(evaluator, obj, params): @argument_clinic('obj, type, /')
obj = _follow_param(evaluator, params, 0) def builtins_isinstance(evaluator, objects, types):
raw_classes = _follow_param(evaluator, params, 1)
bool_results = set([]) bool_results = set([])
for o in obj: for o in objects:
try: try:
mro_func = o.py__class__(evaluator).py__mro__ mro_func = o.py__class__(evaluator).py__mro__
except AttributeError: except AttributeError:
@@ -179,7 +178,7 @@ def builtins_isinstance(evaluator, obj, params):
mro = mro_func(evaluator) mro = mro_func(evaluator)
for cls_or_tup in raw_classes: for cls_or_tup in types:
if cls_or_tup.is_class(): if cls_or_tup.is_class():
bool_results.add(cls_or_tup in mro) bool_results.add(cls_or_tup in mro)
else: else: