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

get rid of the evaluate_generator param

Browse Source
This commit is contained in:
Dave Halter
2014-07-30 16:36:27 +02:00
parent 565cfce2fe
commit cf63d20988
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate/recursion.py
View File

@@ -4,7 +4,7 @@ must stop recursions going mad. Some settings are here to make |jedi| stop at
the right time. You can read more about them :ref:`here <settings-recursion>`.
Next to :mod:`jedi.evaluate.cache` this module also makes |jedi| not
thread-safe. Why? ``ExecutionRecursionDecorator`` uses class variables to
thread-safe. Why? ``execution_recursion_decorator`` uses class variables to
count the function calls.
"""
from jedi.parser import representation as pr
@@ -100,12 +100,12 @@ class _RecursionNode(object):
def execution_recursion_decorator(func):
def run(execution, evaluate_generator=False):
def run(execution):
detector = execution._evaluator.execution_recursion_detector
if detector.push_execution(execution, evaluate_generator):
if detector.push_execution(execution):
result = []
else:
result = func(execution, evaluate_generator)
result = func(execution)
detector.pop_execution()
return result
@@ -123,13 +123,13 @@ class ExecutionRecursionDetector(object):
self.execution_funcs = set()
self.execution_count = 0
def __call__(self, execution, evaluate_generator=False):
def __call__(self, execution):
debug.dbg('Execution recursions: %s', execution, self.recursion_level,
self.execution_count, len(self.execution_funcs))
if self.check_recursion(execution, evaluate_generator):
if self.check_recursion(execution):
result = []
else:
result = self.func(execution, evaluate_generator)
result = self.func(execution)
self.pop_execution()
return result
@@ -137,7 +137,7 @@ class ExecutionRecursionDetector(object):
cls.parent_execution_funcs.pop()
cls.recursion_level -= 1
def push_execution(cls, execution, evaluate_generator):
def push_execution(cls, execution):
in_par_execution_funcs = execution.base in cls.parent_execution_funcs
in_execution_funcs = execution.base in cls.execution_funcs
cls.recursion_level += 1
@@ -151,7 +151,7 @@ class ExecutionRecursionDetector(object):
if isinstance(execution.base, (iterable.Array, iterable.Generator)):
return False
module = execution.get_parent_until()
if evaluate_generator or module == compiled.builtin:
if module == compiled.builtin:
return False
if in_par_execution_funcs: