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>
diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 1faf29e..4205ca8 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -79,6 +79,24 @@
>>> f(1, 2, 3, *(4, 5), x=6, y=7, **UserDict(a=8, b=9))
(1, 2, 3, 4, 5) {'a': 8, 'b': 9, 'x': 6, 'y': 7}
+Mix keyword arguments and dict unpacking
+
+ >>> d1 = {'a':1}
+
+ >>> d2 = {'c':3}
+
+ >>> f(b=2, **d1, **d2)
+ () {'a': 1, 'b': 2, 'c': 3}
+
+ >>> f(**d1, b=2, **d2)
+ () {'a': 1, 'b': 2, 'c': 3}
+
+ >>> f(**d1, **d2, b=2)
+ () {'a': 1, 'b': 2, 'c': 3}
+
+ >>> f(**d1, b=2, **d2, d=4)
+ () {'a': 1, 'b': 2, 'c': 3, 'd': 4}
+
Examples with invalid arguments (TypeErrors). We're also testing the function
names in the exception messages.