diff options
| author |   Mark Shannon <mark@hotpy.org> | 2020-06-01 10:42:42 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-06-01 10:42:42 +0100 |
| commit | db64f12e4deda2abbafb6d2bd5c06762fca991ff (patch) | |
| tree | cbaf24cd7eea578450bd3ea6396cf1cd4bbddf4a /Python/compile.c | |
| parent | bpo-30008: Fix OpenSSL no-deprecated compilation (GH-20397) (diff) | |
| download | cpython-db64f12e4deda2abbafb6d2bd5c06762fca991ff.tar.gz cpython-db64f12e4deda2abbafb6d2bd5c06762fca991ff.tar.bz2 cpython-db64f12e4deda2abbafb6d2bd5c06762fca991ff.zip | |
Make sure that keyword arguments are merged into the arguments dictionary when dict unpacking and keyword arguments are interleaved. (GH-20553)
Diffstat (limited to 'Python/compile.c')
| -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 4a587c00fd4..fccc688affc 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; } |