1
0
forked from VimPlug/jedi

string-annotations should only be interpreted by the pep-0484 code, not the parser

This commit is contained in:
Claude
2015-12-15 00:31:47 +01:00
parent 626fa60d03
commit 3cef8b6d55
2 changed files with 15 additions and 18 deletions
+12 -2
View File
@@ -17,13 +17,23 @@ x support `@no_type_check` and `@no_type_check_decorator`
"""
from itertools import chain
from jedi.parser import Parser, load_grammar
from jedi.evaluate.cache import memoize_default
from jedi.evaluate.compiled import CompiledObject
def _evaluate_for_annotation(evaluator, annotation):
if annotation is not None:
definitions = evaluator.eval_element(annotation)
definitions = set()
for definition in evaluator.eval_element(annotation):
if (isinstance(definition, CompiledObject) and
isinstance(definition.obj, str)):
p = Parser(load_grammar(), definition.obj)
element = p.module.children[0].children[0]
element.parent = annotation.parent
definitions |= evaluator.eval_element(element)
else:
definitions.add(definition)
return list(chain.from_iterable(
evaluator.execute(d) for d in definitions))
else: