https://github.com/python/cpython/commit/9c1520244151f36e010c1b04bedf14747a28517d
commit: 9c1520244151f36e010c1b04bedf14747a28517d
branch: main
author: Jacob Walls <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-05-13T10:56:09+03:00
summary:
gh-87106: Fix inspect.signature.bind() handling of positional-only arguments
with **kwargs (GH-103404)
files:
A Misc/NEWS.d/next/Library/2023-04-10-00-04-37.gh-issue-87106.UyBnPQ.rst
M Lib/inspect.py
M Lib/test/test_inspect/test_inspect.py
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 84260b251a4fb8..e6e49a4ffa673a 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -3106,6 +3106,8 @@ def _bind(self, args, kwargs, *, partial=False):
parameters_ex = ()
arg_vals = iter(args)
+ pos_only_param_in_kwargs = []
+
while True:
# Let's iterate through the positional arguments and corresponding
# parameters
@@ -3126,10 +3128,10 @@ def _bind(self, args, kwargs, *, partial=False):
break
elif param.name in kwargs:
if param.kind == _POSITIONAL_ONLY:
- msg = '{arg!r} parameter is positional only, ' \
- 'but was passed as a keyword'
- msg = msg.format(arg=param.name)
- raise TypeError(msg) from None
+ # Raise a TypeError once we are sure there is no
+ # **kwargs param later.
+ pos_only_param_in_kwargs.append(param)
+ continue
parameters_ex = (param,)
break
elif (param.kind == _VAR_KEYWORD or
@@ -3211,20 +3213,22 @@ def _bind(self, args, kwargs, *, partial=False):
format(arg=param_name)) from None
else:
- if param.kind == _POSITIONAL_ONLY:
- # This should never happen in case of a properly built
- # Signature object (but let's have this check here
- # to ensure correct behaviour just in case)
- raise TypeError('{arg!r} parameter is positional only, '
- 'but was passed as a keyword'. \
- format(arg=param.name))
-
arguments[param_name] = arg_val
if kwargs:
if kwargs_param is not None:
# Process our '**kwargs'-like parameter
arguments[kwargs_param.name] = kwargs
+ elif pos_only_param_in_kwargs:
+ raise TypeError(
+ 'got some positional-only arguments passed as '
+ 'keyword arguments: {arg!r}'.format(
+ arg=', '.join(
+ param.name
+ for param in pos_only_param_in_kwargs
+ ),
+ ),
+ )
else:
raise TypeError(
'got an unexpected keyword argument {arg!r}'.format(
diff --git a/Lib/test/test_inspect/test_inspect.py
b/Lib/test/test_inspect/test_inspect.py
index 8bd13033490b81..011d42f34b6461 100644
--- a/Lib/test/test_inspect/test_inspect.py
+++ b/Lib/test/test_inspect/test_inspect.py
@@ -5089,15 +5089,30 @@ def test(a_po, b_po, c_po=3, /, foo=42, *, bar=50,
**kwargs):
self.assertEqual(self.call(test, 1, 2, foo=4, bar=5),
(1, 2, 3, 4, 5, {}))
- with self.assertRaisesRegex(TypeError, "but was passed as a keyword"):
- self.call(test, 1, 2, foo=4, bar=5, c_po=10)
+ self.assertEqual(self.call(test, 1, 2, foo=4, bar=5, c_po=10),
+ (1, 2, 3, 4, 5, {'c_po': 10}))
- with self.assertRaisesRegex(TypeError, "parameter is positional only"):
- self.call(test, 1, 2, c_po=4)
+ self.assertEqual(self.call(test, 1, 2, 30, c_po=31, foo=4, bar=5),
+ (1, 2, 30, 4, 5, {'c_po': 31}))
- with self.assertRaisesRegex(TypeError, "parameter is positional only"):
+ self.assertEqual(self.call(test, 1, 2, 30, foo=4, bar=5, c_po=31),
+ (1, 2, 30, 4, 5, {'c_po': 31}))
+
+ self.assertEqual(self.call(test, 1, 2, c_po=4),
+ (1, 2, 3, 42, 50, {'c_po': 4}))
+
+ with self.assertRaisesRegex(TypeError, "missing 2 required positional
arguments"):
self.call(test, a_po=1, b_po=2)
+ def without_var_kwargs(c_po=3, d_po=4, /):
+ return c_po, d_po
+
+ with self.assertRaisesRegex(
+ TypeError,
+ "positional-only arguments passed as keyword arguments: 'c_po,
d_po'",
+ ):
+ self.call(without_var_kwargs, c_po=33, d_po=44)
+
def test_signature_bind_with_self_arg(self):
# Issue #17071: one of the parameters is named "self
def test(a, self, b):
diff --git
a/Misc/NEWS.d/next/Library/2023-04-10-00-04-37.gh-issue-87106.UyBnPQ.rst
b/Misc/NEWS.d/next/Library/2023-04-10-00-04-37.gh-issue-87106.UyBnPQ.rst
new file mode 100644
index 00000000000000..6f13188f6f119f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-04-10-00-04-37.gh-issue-87106.UyBnPQ.rst
@@ -0,0 +1,3 @@
+Fixed handling in :meth:`inspect.signature.bind` of keyword arguments having
+the same name as positional-only arguments when a variadic keyword argument
+(e.g. ``**kwargs``) is present.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
