diff --git a/jedi/docstrings.py b/jedi/docstrings.py index 79d20246..39134b19 100644 --- a/jedi/docstrings.py +++ b/jedi/docstrings.py @@ -8,17 +8,11 @@ import parsing DOCSTRING_PARAM_PATTERNS = [ r'\s*:type\s+%s:\s*([^\n]+)', # Sphinx r'\s*@type\s+%s:\s*([^\n]+)', # Epidoc - r'\s*%s\s+\(([^()]+)\)' # googley ] DOCSTRING_RETURN_PATTERNS = [ re.compile(r'\s*:rtype:\s*([^\n]+)', re.M), # Sphinx re.compile(r'\s*@rtype:\s*([^\n]+)', re.M), # Epidoc - - # Googley is the most undocumented format for - # return types, so we try to analyze the first - # line or line after `Returns:` keyword - re.compile(r'returns\s*:[\s\n]*([^\n]+)', re.M|re.I), ] #@cache.memoize_default() # TODO add diff --git a/test/completion/docstring.py b/test/completion/docstring.py index 202461ec..66b6744e 100644 --- a/test/completion/docstring.py +++ b/test/completion/docstring.py @@ -17,22 +17,6 @@ def f(a, b): #? dict() f() -def g(a, b): - """ asdfasdf - Arguments: - a (str): blablabla - - Returns: list - Blah blah. - """ - #? str() - a - #? - b - -#? list() -g() - def e(a, b): """ asdfasdf @type a: str diff --git a/test/completion/std.py b/test/completion/std.py index 6ea57f30..0eec6367 100644 --- a/test/completion/std.py +++ b/test/completion/std.py @@ -83,7 +83,10 @@ row = c.fetchall()[0] row.keys()[0] def huhu(db): - """db (sqlite3.Connection): the db connection""" + """ + :type db: sqlite3.Connection + :param db: the db connection + """ #? sqlite3.Connection() db