diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-06-01 16:07:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 16:07:32 (GMT) |
| commit | 410b730c205133315c604350f4bdc2345588b397 (patch) | |
| tree | 26ade6c6c3727677dfbf4e599dc4423e2453d63a /Python | |
| parent | a169961dfc777eb467a2b1027391285a7706329a (diff) | |
| download | cpython-410b730c205133315c604350f4bdc2345588b397.zip cpython-410b730c205133315c604350f4bdc2345588b397.tar.gz cpython-410b730c205133315c604350f4bdc2345588b397.tar.bz2 | |
Make sure that keyword arguments are merged into the arguments dictionary when dict unpacking and keyword arguments are interleaved. (GH-20553) (GH-20569)
(cherry picked from commit db64f12e4deda2abbafb6d2bd5c06762fca991ff)
Co-authored-by: Mark Shannon <mark@hotpy.org>
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/compile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Python/compile.c b/Python/compile.c index 4a587c0..fccc688 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4321,6 +4321,9 @@ ex_call: if (!compiler_subkwargs(c, keywords, i - nseen, i)) { return 0; } + if (have_dict) { + ADDOP_I(c, DICT_MERGE, 1); + } have_dict = 1; nseen = 0; } |