1
0
forked from VimPlug/jedi

remove user_stmt and user_scope stuff - yes!

This commit is contained in:
Dave Halter
2014-01-17 02:33:53 +01:00
parent fc1899ecd4
commit b30a186f8f
5 changed files with 19 additions and 121 deletions

View File

@@ -17,7 +17,7 @@ annotations.
import re
from jedi.evaluate.cache import memoize_default
from jedi.parser import Parser
from jedi.parser.user_context import UserContextParser
DOCSTRING_PARAM_PATTERNS = [
r'\s*:type\s+%s:\s*([^\n]+)', # Sphinx
@@ -49,10 +49,10 @@ def follow_param(evaluator, param):
param_str)
user_position = (2, 0)
p = Parser(param_str, None, user_position, no_docstr=True)
if p.user_stmt is None:
p = UserContextParser(param_str, None, user_position, no_docstr=True)
if p.user_stmt() is None:
return []
return evaluator.eval_statement(p.user_stmt)
return evaluator.eval_statement(p.user_stmt())
return []
@@ -115,8 +115,8 @@ def find_return_types(evaluator, func):
if not type_str:
return []
p = Parser(type_str, None, (1, 0), no_docstr=True)
if p.user_stmt is None:
p = UserContextParser(type_str, None, (1, 0), no_docstr=True)
if p.user_stmt() is None:
return []
p.user_stmt.parent = func
p.user_stmt().parent = func
return list(evaluator.eval_statement(p.user_stmt))