commit 410b730c205133315c604350f4bdc2345588b397
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jun 01 09:07:32 2020 -0700
committer GitHub <noreply@github.com> Mon Jun 01 17:07:32 2020 +0100
tree 26ade6c6c3727677dfbf4e599dc4423e2453d63a
parent a169961dfc777eb467a2b1027391285a7706329a

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>

Python/compile.c

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 @@
                     if (!compiler_subkwargs(c, keywords, i - nseen, i)) {
                         return 0;
                     }
+                    if (have_dict) {
+                        ADDOP_I(c, DICT_MERGE, 1);
+                    }
                     have_dict = 1;
                     nseen = 0;
                 }