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

Merge with master

Browse Source 
The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
This commit is contained in:
Dave Halter
2018-01-20 18:58:43 +01:00
parent 19b3580ba7 877383b110
commit d986c44b94
48 changed files with 205 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/docstrings.py
View File

@@ -188,7 +188,7 @@ def _evaluate_for_statement_string(module_context, string):
Need this docstring so that if the below part is not valid Python this
is still a function.
'''
{0}
{}
"""))
if string is None:
return []
@@ -252,7 +252,7 @@ def _execute_array_values(evaluator, array):
for typ in lazy_context.infer()
)
values.append(LazyKnownContexts(objects))
return set([FakeSequence(evaluator, array.array_type, values)])
return {FakeSequence(evaluator, array.array_type, values)}
else:
return array.execute_evaluated()