summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/inspect.py9
-rw-r--r--Lib/test/test_inspect.py13
-rw-r--r--Misc/NEWS3
3 files changed, 25 insertions, 0 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 3debc24..57cb3dc 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -2130,6 +2130,15 @@ def _signature_from_callable(obj, *,
# Was this function wrapped by a decorator?
if follow_wrapper_chains:
obj = unwrap(obj, stop=(lambda f: hasattr(f, "__signature__")))
+ if isinstance(obj, types.MethodType):
+ # If the unwrapped object is a *method*, we might want to
+ # skip its first parameter (self).
+ # See test_signature_wrapped_bound_method for details.
+ return _signature_from_callable(
+ obj,
+ follow_wrapper_chains=follow_wrapper_chains,
+ skip_bound_arg=skip_bound_arg,
+ sigcls=sigcls)
try:
sig = obj.__signature__
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 9492cad..9f09b83 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -2086,6 +2086,19 @@ class TestSignatureObject(unittest.TestCase):
with self.assertRaisesRegex(ValueError, 'invalid method signature'):
self.signature(Test())
+ def test_signature_wrapped_bound_method(self):
+ # Issue 24298
+ class Test:
+ def m1(self, arg1, arg2=1) -> int:
+ pass
+ @functools.wraps(Test().m1)
+ def m1d(*args, **kwargs):
+ pass
+ self.assertEqual(self.signature(m1d),
+ ((('arg1', ..., ..., "positional_or_keyword"),
+ ('arg2', 1, ..., "positional_or_keyword")),
+ int))
+
def test_signature_on_classmethod(self):
class Test:
@classmethod
diff --git a/Misc/NEWS b/Misc/NEWS
index b712b4d..121ea5b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -263,6 +263,9 @@ Library
- Issue #23898: Fix inspect.classify_class_attrs() to support attributes
with overloaded __eq__ and __bool__. Patch by Mike Bayer.
+- Issue #24298: Fix inspect.signature() to correctly unwrap wrappers
+ around bound methods.
+
IDLE
----