diff --git a/jedi/evaluate/syntax_tree.py b/jedi/evaluate/syntax_tree.py index 787cd2c4..958b5a2a 100644 --- a/jedi/evaluate/syntax_tree.py +++ b/jedi/evaluate/syntax_tree.py @@ -431,7 +431,7 @@ def _is_annotation_name(name): c = ancestor.children if len(c) > 1 and c[1].type == 'annassign': return c[1].start_pos <= name.start_pos < c[1].end_pos - return True + return False def _is_tuple(context): diff --git a/test/test_evaluate/test_compiled.py b/test/test_evaluate/test_compiled.py index 86375ee9..1f64f004 100644 --- a/test/test_evaluate/test_compiled.py +++ b/test/test_evaluate/test_compiled.py @@ -2,12 +2,13 @@ from textwrap import dedent from jedi.evaluate import compiled from jedi.evaluate.context import instance +from jedi.evaluate.helpers import execute_evaluated def test_simple(evaluator): obj = compiled.create_simple_object(evaluator, u'_str_') upper, = obj.py__getattribute__(u'upper') - objs = list(upper.execute_evaluated()) + objs = list(execute_evaluated(upper)) assert len(objs) == 1 assert isinstance(objs[0], instance.CompiledInstance) diff --git a/test/test_evaluate/test_representation.py b/test/test_evaluate/test_representation.py index 61130230..11b528d3 100644 --- a/test/test_evaluate/test_representation.py +++ b/test/test_evaluate/test_representation.py @@ -1,5 +1,7 @@ from textwrap import dedent +from jedi.evaluate.helpers import execute_evaluated + def get_definition_and_evaluator(Script, source): first, = Script(dedent(source)).goto_definitions() @@ -20,8 +22,8 @@ def test_function_execution(Script): # Now just use the internals of the result (easiest way to get a fully # usable function). # Should return the same result both times. - assert len(func.execute_evaluated()) == 1 - assert len(func.execute_evaluated()) == 1 + assert len(execute_evaluated(func)) == 1 + assert len(execute_evaluated(func)) == 1 def test_class_mro(Script):