[Python-checkins] cpython: inspect.signature: Add support for decorated (wrapped) builtins #20425

yury.selivanov python-checkins at python.org
Wed Jan 29 16:53:09 CET 2014


http://hg.python.org/cpython/rev/a9fedabb69e5
changeset:   88810:a9fedabb69e5
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Jan 29 10:52:57 2014 -0500
summary:
  inspect.signature: Add support for decorated (wrapped) builtins #20425

files:
  Lib/inspect.py           |   6 +++---
  Lib/test/test_inspect.py |  15 +++++++++++++++
  2 files changed, 18 insertions(+), 3 deletions(-)


diff --git a/Lib/inspect.py b/Lib/inspect.py
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1530,9 +1530,6 @@
     if not callable(obj):
         raise TypeError('{!r} is not a callable object'.format(obj))
 
-    if _signature_is_builtin(obj):
-        return Signature.from_builtin(obj)
-
     if isinstance(obj, types.MethodType):
         # In this case we skip the first parameter of the underlying
         # function (usually `self` or `cls`).
@@ -1570,6 +1567,9 @@
 
         return sig.replace(parameters=new_params)
 
+    if _signature_is_builtin(obj):
+        return Signature.from_builtin(obj)
+
     if isinstance(obj, types.FunctionType):
         return Signature.from_function(obj)
 
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
@@ -1655,6 +1655,21 @@
             __call__ = type
         test_callable(ThisWorksNow())
 
+    @unittest.skipIf(MISSING_C_DOCSTRINGS,
+                     "Signature information for builtins requires docstrings")
+    def test_signature_on_decorated_builtins(self):
+        func = _testcapi.docstring_with_signature_with_defaults
+
+        def decorator(func):
+            @functools.wraps(func)
+            def wrapper(*args, **kwargs) -> int:
+                return func(*args, **kwargs)
+            return wrapper
+
+        decorated_func = decorator(func)
+
+        self.assertEqual(inspect.signature(func),
+                         inspect.signature(decorated_func))
 
     def test_signature_on_builtins_no_signature(self):
         with self.assertRaisesRegex(ValueError, 'no signature found for builtin'):

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list