Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3.5 (issue #24975)

Browse source
This commit is contained in:
Yury Selivanov 2015-09-02 15:50:04 -04:00
commit 1fa3652e59
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/ast.c
View file

@ -199,8 +199,10 @@ validate_expr(expr_ty exp, expr_context_ty ctx)
"Dict doesn't have the same number of keys as values");
return 0;
}
return validate_exprs(exp->v.Dict.keys, Load, 0) &&
validate_exprs(exp->v.Dict.values, Load, 0);
/* null_ok=1 for keys expressions to allow dict unpacking to work in
dict literals, i.e. ``{**{a:b}}`` */
return validate_exprs(exp->v.Dict.keys, Load, /*null_ok=*/ 1) &&
validate_exprs(exp->v.Dict.values, Load, /*null_ok=*/ 0);
case Set_kind:
return validate_exprs(exp->v.Set.elts, Load, 0);
#define COMP(NAME) \