VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

A lot of small bug fixes.

Browse Source
This commit is contained in:
Dave Halter
2016-12-02 15:08:54 +01:00
parent 16a48a7a45
commit dfc06dfe83
5 changed files with 90 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate/docstrings.py
View File

@@ -25,7 +25,7 @@ from jedi.evaluate.cache import memoize_default
from jedi.parser import ParserWithRecovery, load_grammar
from jedi.parser.tree import search_ancestor
from jedi.common import indent_block
from jedi.evaluate.iterable import ArrayLiteralContext, FakeSequence, AlreadyEvaluated
from jedi.evaluate.iterable import SequenceLiteralContext, FakeSequence, AlreadyEvaluated
DOCSTRING_PARAM_PATTERNS = [
@@ -173,7 +173,7 @@ def _execute_array_values(evaluator, array):
Tuples indicate that there's not just one return value, but the listed
ones. `(str, int)` means that it returns a tuple with both types.
"""
if isinstance(array, ArrayLiteralContext):
if isinstance(array, SequenceLiteralContext):
values = []
for lazy_context in array.py__iter__():
objects = unite(_execute_array_values(evaluator, typ) for typ in lazy_context.infer())
@@ -194,7 +194,7 @@ def follow_param(module_context, param):
types = eval_docstring(func.raw_doc)
if func.name.value == '__init__':
cls = search_ancestor(func, 'classdef')
if cls.type == 'classdef':
if cls is not None:
types |= eval_docstring(cls.raw_doc)
return types