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

fix most issues related to the py__call__ stuff and generalize it.

Browse Source
This commit is contained in:
Dave Halter
2014-07-30 15:23:41 +02:00
parent 1e6a950aec
commit 373ff2c45a
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/__init__.py
+9 -9
View File
@@ -325,24 +325,24 @@ class Evaluator(object):
pass
if isinstance(obj, iterable.GeneratorMethod):
return obj.py__call__(params)
return obj.py__call__(self, params)
elif obj.isinstance(compiled.CompiledObject):
return obj.py__call__(self, params)
elif obj.isinstance(er.Class):
# There maybe executions of executions.
return obj.py__call__(params)
return obj.py__call__(self, params)
else:
stmts = []
if obj.isinstance(er.Function):
return obj.py__call__(params, evaluate_generator)
return obj.py__call__(self, params, evaluate_generator)
else:
if hasattr(obj, 'execute_subscope_by_name'):
try:
stmts = obj.execute_subscope_by_name('__call__', params)
except KeyError:
debug.warning("no __call__ func available %s", obj)
else:
try:
func = obj.py__call__
except AttributeError:
debug.warning("no execution possible %s", obj)
return []
else:
return func(self, params)
debug.dbg('execute result: %s in %s', stmts, obj)
return imports.follow_imports(self, stmts)