Skip to content

gh-102551 Fixed inspect.signature.bind behavior on kwargs #102820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions Lib/inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -2835,23 +2835,35 @@ class BoundArguments:
Dict of keyword arguments values.
"""

__slots__ = ('arguments', '_signature', '__weakref__')
__slots__ = ('arguments', '_signature', '_kwarg_names', '__weakref__')

def __init__(self, signature, arguments):
def __init__(self, signature, arguments, kwarg_names=None):
self.arguments = arguments
self._signature = signature
if kwarg_names is None:
self._kwarg_names = {}
else:
self._kwarg_names = kwarg_names

@property
def signature(self):
return self._signature

@property
def kwarg_names(self):
return self.kwarg_names

@property
def args(self):
args = []
for param_name, param in self._signature.parameters.items():
if param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY):
break

if (param.kind == _POSITIONAL_OR_KEYWORD and \
param_name in self._kwarg_names):
break

try:
arg = self.arguments[param_name]
except KeyError:
Expand All @@ -2876,6 +2888,9 @@ def kwargs(self):
if not kwargs_started:
if param.kind in (_VAR_KEYWORD, _KEYWORD_ONLY):
kwargs_started = True
elif (param.kind == _POSITIONAL_OR_KEYWORD and
param_name in self._kwarg_names):
kwargs_started = True
else:
if param_name not in self.arguments:
kwargs_started = True
Expand Down Expand Up @@ -2932,7 +2947,8 @@ def __eq__(self, other):
if not isinstance(other, BoundArguments):
return NotImplemented
return (self.signature == other.signature and
self.arguments == other.arguments)
self.arguments == other.arguments and
self.kwarg_names == other.kwarg_names)

def __setstate__(self, state):
self._signature = state['_signature']
Expand Down Expand Up @@ -3088,6 +3104,7 @@ def _bind(self, args, kwargs, *, partial=False):
"""Private method. Don't use directly."""

arguments = {}
kwarg_names = set(kwargs.keys())

parameters = iter(self.parameters.values())
parameters_ex = ()
Expand Down Expand Up @@ -3217,7 +3234,7 @@ def _bind(self, args, kwargs, *, partial=False):
'got an unexpected keyword argument {arg!r}'.format(
arg=next(iter(kwargs))))

return self._bound_arguments_cls(self, arguments)
return self._bound_arguments_cls(self, arguments, kwarg_names)

def bind(self, /, *args, **kwargs):
"""Get a BoundArguments object, that maps the passed `args`
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -4084,7 +4084,7 @@ def test(a, self, b):
ba = sig.bind(1, 2, 3)
self.assertEqual(ba.args, (1, 2, 3))
ba = sig.bind(1, self=2, b=3)
self.assertEqual(ba.args, (1, 2, 3))
self.assertEqual(ba.args, (1,))

def test_signature_bind_vararg_name(self):
def test(a, *args):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed inspect.signature.bind behavior on keyword arguments