[Python-checkins] cpython (3.4): Issue 24298: Fix signature() to properly unwrap wrappers around bound methods
yury.selivanov
python-checkins at python.org
Thu May 28 04:01:29 CEST 2015
https://hg.python.org/cpython/rev/42819b176d63
changeset: 96323:42819b176d63
branch: 3.4
parent: 96319:901178d9d07f
user: Yury Selivanov <yselivanov at sprymix.com>
date: Wed May 27 21:56:53 2015 -0400
summary:
Issue 24298: Fix signature() to properly unwrap wrappers around bound methods
files:
Lib/inspect.py | 8 ++++++++
Lib/test/test_inspect.py | 13 +++++++++++++
Misc/NEWS | 3 +++
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/Lib/inspect.py b/Lib/inspect.py
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1911,6 +1911,14 @@
# 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_internal(
+ obj,
+ follow_wrapper_chains=follow_wrapper_chains,
+ skip_bound_arg=skip_bound_arg)
try:
sig = obj.__signature__
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -1939,6 +1939,19 @@
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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -274,6 +274,9 @@
- 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
----
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list