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

Calling an InstanceElement of an Instance of CompiledObject doesn't raise an error anymore. Yes, it's really that complicated.

Browse Source
This commit is contained in:
Dave Halter
2014-07-30 19:49:41 +02:00
parent 0851e7667e
commit 870abe73d4
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/evaluate/representation.py
View File

@@ -58,7 +58,7 @@ class Instance(use_metaclass(CachedMetaClass, Executed)):
# compare the module path with the builtin name.
self.var_args = iterable.check_array_instances(evaluator, self)
else:
# need to execute the __init__ function, because the dynamic param
# Need to execute the __init__ function, because the dynamic param
# searching needs it.
with common.ignored(KeyError):
self.execute_subscope_by_name('__init__', self.var_args)
@@ -251,9 +251,14 @@ class InstanceElement(use_metaclass(CachedMetaClass, pr.Base)):
return isinstance(self.var, cls)
def py__call__(self, evaluator, params):
# TODO Why are CompiledObject and Instance even InstanceObjects?
# TODO Why is CompiledObject even an InstanceObject?
if isinstance(self.var, (compiled.CompiledObject, Instance)):
return self.var.py__call__(evaluator, params)
try:
func = self.var.py__call__
except AttributeError:
return []
else:
return func(evaluator, params)
else:
return Function.py__call__(self, evaluator, params)