From 0486f819c93de81120ad75570df5d6837017c03d Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Wed, 29 Jan 2014 12:18:59 -0500 Subject: inspect.signature: Make sure that if a callable object has '_patialmethod' attribute, that attribute is an instance of 'functools.partialmethod'. --- Lib/inspect.py | 23 ++++++++++++----------- Lib/test/test_inspect.py | 5 +++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py index fbea3df..3ad4a82 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1651,20 +1651,21 @@ def signature(obj): except AttributeError: pass else: - # Unbound partialmethod (see functools.partialmethod) - # This means, that we need to calculate the signature - # as if it's a regular partial object, but taking into - # account that the first positional argument - # (usually `self`, or `cls`) will not be passed - # automatically (as for boundmethods) + if isinstance(partialmethod, functools.partialmethod): + # Unbound partialmethod (see functools.partialmethod) + # This means, that we need to calculate the signature + # as if it's a regular partial object, but taking into + # account that the first positional argument + # (usually `self`, or `cls`) will not be passed + # automatically (as for boundmethods) - wrapped_sig = signature(partialmethod.func) - sig = _signature_get_partial(wrapped_sig, partialmethod, (None,)) + wrapped_sig = signature(partialmethod.func) + sig = _signature_get_partial(wrapped_sig, partialmethod, (None,)) - first_wrapped_param = tuple(wrapped_sig.parameters.values())[0] - new_params = (first_wrapped_param,) + tuple(sig.parameters.values()) + first_wrapped_param = tuple(wrapped_sig.parameters.values())[0] + new_params = (first_wrapped_param,) + tuple(sig.parameters.values()) - return sig.replace(parameters=new_params) + return sig.replace(parameters=new_params) if _signature_is_builtin(obj): return Signature.from_builtin(obj) diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 19ccbcb..f06b5b4 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -1983,6 +1983,11 @@ class TestSignatureObject(unittest.TestCase): ('c', 1, ..., 'keyword_only')), 'spam')) + def test_signature_on_fake_partialmethod(self): + def foo(a): pass + foo._partialmethod = 'spam' + self.assertEqual(str(inspect.signature(foo)), '(a)') + def test_signature_on_decorated(self): import functools -- cgit v0.12