gh-136300: Modify C tests to conform to PEP-737 (GH-136301)

wsfulton · vstinner · web-flow · commit 7de8ea7be6c1 · 2025-07-11T15:18:35.000+02:00
- Use %T format specifier instead of %s and Py_TYPE(x)-&gt;tp_name.
- Remove legacy %.200s format specifier for truncating type names.

Co-authored-by: Victor Stinner &lt;vstinner@python.org&gt;
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
@@ -1855,8 +1855,7 @@ ndarray_subscript(PyObject *op, PyObject *key)
 
 type_error:
     PyErr_Format(PyExc_TypeError,
-        "cannot index memory using \"%.200s\"",
-        Py_TYPE(key)->tp_name);
+        "cannot index memory using \"%T\"", key);
 err_occurred:
     Py_DECREF(nd);
     return NULL;
diff --git a/Modules/_testcapi/monitoring.c b/Modules/_testcapi/monitoring.c
@@ -109,7 +109,7 @@ static PyTypeObject PyCodeLike_Type = {
 };
 
 #define RAISE_UNLESS_CODELIKE(v)  if (!Py_IS_TYPE((v), &PyCodeLike_Type)) { \
-        PyErr_Format(PyExc_TypeError, "expected a code-like, got %s", Py_TYPE(v)->tp_name); \
+        PyErr_Format(PyExc_TypeError, "expected a code-like, got %T", v); \
         return NULL; \
     }
 
diff --git a/Modules/_testcapi/time.c b/Modules/_testcapi/time.c
@@ -5,8 +5,7 @@ static int
 pytime_from_nanoseconds(PyTime_t *tp, PyObject *obj)
 {
     if (!PyLong_Check(obj)) {
-        PyErr_Format(PyExc_TypeError, "expect int, got %s",
-                     Py_TYPE(obj)->tp_name);
+        PyErr_Format(PyExc_TypeError, "expect int, got %T", obj);
         return -1;
     }
 
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -515,8 +515,7 @@ test_thread_state(PyObject *self, PyObject *args)
         return NULL;
 
     if (!PyCallable_Check(fn)) {
-        PyErr_Format(PyExc_TypeError, "'%s' object is not callable",
-            Py_TYPE(fn)->tp_name);
+        PyErr_Format(PyExc_TypeError, "'%T' object is not callable", fn);
         return NULL;
     }
 
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -2207,8 +2207,7 @@ get_code(PyObject *obj)
         return (PyCodeObject *)PyFunction_GetCode(obj);
     }
     return (PyCodeObject *)PyErr_Format(
-        PyExc_TypeError, "expected function or code object, got %s",
-        Py_TYPE(obj)->tp_name);
+        PyExc_TypeError, "expected function or code object, got %T", obj);
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static PyTypeObject PyCodeLike_Type = {`
`109`	`109`	`};`
`110`	`110`
`111`	`111`	`#define RAISE_UNLESS_CODELIKE(v) if (!Py_IS_TYPE((v), &PyCodeLike_Type)) { \`
`112`		`- PyErr_Format(PyExc_TypeError, "expected a code-like, got %s", Py_TYPE(v)->tp_name); \`
	`112`	`+ PyErr_Format(PyExc_TypeError, "expected a code-like, got %T", v); \`
`113`	`113`	`return NULL; \`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ static int`
`5`	`5`	`pytime_from_nanoseconds(PyTime_t tp, PyObject obj)`
`6`	`6`	`{`
`7`	`7`	`if (!PyLong_Check(obj)) {`
`8`		`- PyErr_Format(PyExc_TypeError, "expect int, got %s",`
`9`		`- Py_TYPE(obj)->tp_name);`
	`8`	`+ PyErr_Format(PyExc_TypeError, "expect int, got %T", obj);`
`10`	`9`	`return -1;`
`11`	`10`	`}`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,7 @@ test_thread_state(PyObject self, PyObject args)`
`515`	`515`	`return NULL;`
`516`	`516`
`517`	`517`	`if (!PyCallable_Check(fn)) {`
`518`		`- PyErr_Format(PyExc_TypeError, "'%s' object is not callable",`
`519`		`- Py_TYPE(fn)->tp_name);`
	`518`	`+ PyErr_Format(PyExc_TypeError, "'%T' object is not callable", fn);`
`520`	`519`	`return NULL;`
`521`	`520`	`}`
`522`	`521`
Original file line number	Diff line number	Diff line change
`@@ -2207,8 +2207,7 @@ get_code(PyObject *obj)`
`2207`	`2207`	`return (PyCodeObject *)PyFunction_GetCode(obj);`
`2208`	`2208`	`}`
`2209`	`2209`	`return (PyCodeObject *)PyErr_Format(`
`2210`		`- PyExc_TypeError, "expected function or code object, got %s",`
`2211`		`- Py_TYPE(obj)->tp_name);`
	`2210`	`+ PyExc_TypeError, "expected function or code object, got %T", obj);`
`2212`	`2211`	`}`
`2213`	`2212`
`2214`	`2213`	`static PyObject *`