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

This commit is contained in:
Dave Halter committed 2018-09-24 00:16:13 +02:00
commit ef9d0421fa
8 files changed
+118 -34

No files matched your search

+2 -1
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)