And now remove a pep0484 function that is no longer needed

This commit is contained in:
Dave Halter
2018-03-14 21:51:06 +01:00
parent 053618edd0
commit 1eeb7cb6aa

View File

@@ -43,17 +43,7 @@ def _evaluate_for_annotation(context, annotation, index=None):
and we're interested in that index
"""
context_set = context.eval_node(_fix_forward_reference(context, annotation))
return _check_index(context_set, index).execute_evaluated()
def _check_index(context_set, index):
if index is None:
return context_set
return context_set.filter(
lambda context: context.array_type == u'tuple'
and len(list(context.py__iter__())) >= index
).py__getitem__(index)
return context_set.execute_evaluated()
def _evaluate_annotation_string(context, string, index=None):
@@ -62,7 +52,12 @@ def _evaluate_annotation_string(context, string, index=None):
return NO_CONTEXTS
context_set = context.eval_node(node)
return _check_index(context_set, index).execute_evaluated()
if index is not None:
context_set = context_set.filter(
lambda context: context.array_type == u'tuple'
and len(list(context.py__iter__())) >= index
).py__getitem__(index)
return context_set.execute_evaluated()
def _fix_forward_reference(context, node):