1
0
forked from VimPlug/jedi

evaluator is now used only as an attribute in CompiledObject.

This commit is contained in:
Dave Halter
2015-12-10 16:40:56 +01:00
parent 9e8da17688
commit 5087584fdc
+4 -4
View File
@@ -53,7 +53,7 @@ class CompiledObject(Base):
from jedi.evaluate.representation import Instance from jedi.evaluate.representation import Instance
return set([Instance(self._evaluator, self, params)]) return set([Instance(self._evaluator, self, params)])
else: else:
return set(self._execute_function(self._evaluator, params)) return set(self._execute_function(params))
# Might raise an AttributeError, which is intentional. # Might raise an AttributeError, which is intentional.
self.obj.__call__ self.obj.__call__
@@ -200,7 +200,7 @@ class CompiledObject(Base):
# might not exist sometimes (raises AttributeError) # might not exist sometimes (raises AttributeError)
return FakeName(self._cls().obj.__name__, self) return FakeName(self._cls().obj.__name__, self)
def _execute_function(self, evaluator, params): def _execute_function(self, params):
if self.type != 'funcdef': if self.type != 'funcdef':
return return
@@ -214,8 +214,8 @@ class CompiledObject(Base):
# We want to evaluate everything except None. # We want to evaluate everything except None.
# TODO do we? # TODO do we?
continue continue
bltn_obj = create(evaluator, bltn_obj) bltn_obj = create(self._evaluator, bltn_obj)
for result in evaluator.execute(bltn_obj, params): for result in self._evaluator.execute(bltn_obj, params):
yield result yield result
@property @property