bpo-37645: use str(func) as fallback in _PyObject_FunctionStr()

jdemeyer · jdemeyer · commit 2e1b44ec82c3 · 2019-08-18T20:04:33.000+02:00
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
@@ -201,8 +201,8 @@ Object Protocol
 
    Return a user-friendly string representation of the function-like object
    *func*. This returns ``func.__qualname__ + "()"`` if there is a
-   ``__qualname__`` attribute and ``type(func).__name__ + " object"``
-   otherwise. Note that there is no check that *func* is actually callable.
+   ``__qualname__`` attribute and ``str(func)`` otherwise.
+   Note that there is no check that *func* is actually callable.
 
    .. versionadded:: 3.9
 
diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
@@ -268,7 +268,7 @@
     >>> nothing(*h)
     Traceback (most recent call last):
       ...
-    TypeError: NoneType object argument after * must be an iterable, \
+    TypeError: None argument after * must be an iterable, \
 not function
 
     >>> h(**h)
diff --git a/Objects/object.c b/Objects/object.c
@@ -669,7 +669,7 @@ def _PyObject_FunctionStr(f):
     try:
         return f.__qualname__ + "()"
     except Exception:
-        return type(f).__name__ + " object"
+        return str(f)
 */
 PyObject *
 _PyObject_FunctionStr(PyObject *f)
@@ -686,7 +686,7 @@ _PyObject_FunctionStr(PyObject *f)
         return NULL;
     }
     PyErr_Clear();
-    return PyUnicode_FromFormat("%.200s object", Py_TYPE(f)->tp_name);
+    return PyObject_Str(f);
 }
 
 /* For Python 3.0.1 and later, the old three-way comparison has been
