diff options
author | Dong-hee Na <donghee.na92@gmail.com> | 2017-05-18 04:00:51 +0900 |
---|---|---|
committer | Yury Selivanov <yury@magic.io> | 2017-05-17 12:00:51 -0700 |
commit | 378d70642aa1c8de2a53ecb811927faf0388db2d (patch) | |
tree | b550ad335eedce735d615a132b4c1713896fdcec /Lib/inspect.py | |
parent | f8d05b3a24e745ab4a974b891ac1389e2f11ce4d (diff) | |
download | cpython-git-378d70642aa1c8de2a53ecb811927faf0388db2d.tar.gz |
bpo-30149: Fix partialmethod without explicit self parameter (#1308)
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r-- | Lib/inspect.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index 2894672f50..3317f58f47 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -2241,11 +2241,16 @@ def _signature_from_callable(obj, *, sigcls=sigcls) 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()) - - return sig.replace(parameters=new_params) + if first_wrapped_param.kind is Parameter.VAR_POSITIONAL: + # First argument of the wrapped callable is `*args`, as in + # `partialmethod(lambda *args)`. + return sig + else: + sig_params = tuple(sig.parameters.values()) + assert first_wrapped_param is not sig_params[0] + new_params = (first_wrapped_param,) + sig_params + return sig.replace(parameters=new_params) if isfunction(obj) or _signature_is_functionlike(obj): # If it's a pure Python function, or an object that is duck type |