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

Merge remote-tracking branch 'origin/master' into typeshed

Browse Source
This commit is contained in:
Dave Halter
2018-09-24 00:16:13 +02:00
parent cc493866cd a2b984ce24
commit ef9d0421fa
8 changed files with 118 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/syntax_tree.py
View File

@@ -264,7 +264,8 @@ def eval_atom(context, atom):
array_node_c = array_node.children
except AttributeError:
array_node_c = []
if c[0] == '{' and (array_node == '}' or ':' in array_node_c):
if c[0] == '{' and (array_node == '}' or ':' in array_node_c or
'**' in array_node_c):
context = iterable.DictLiteralContext(context.evaluator, context, atom)
else:
context = iterable.SequenceLiteralContext(context.evaluator, context, atom)