Use a new shiny %T formatting.

serhiy-storchaka · serhiy-storchaka · commit 054f12f61f50 · 2024-04-08T15:14:17.000+03:00
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
@@ -1137,8 +1137,8 @@ c_set(void *ptr, PyObject *value, Py_ssize_t size)
     }
     PyErr_Format(PyExc_TypeError,
                  "one character bytes, bytearray or integer "
-                 "in range(256) expected, not %s",
-                 Py_TYPE(value)->tp_name);
+                 "in range(256) expected, not %T",
+                 value);
     return NULL;
 }
 
@@ -1157,8 +1157,8 @@ u_set(void *ptr, PyObject *value, Py_ssize_t size)
     wchar_t chars[2];
     if (!PyUnicode_Check(value)) {
         PyErr_Format(PyExc_TypeError,
-                     "unicode character expected instead of %s instance",
-                     Py_TYPE(value)->tp_name);
+                     "unicode character expected instead of %T instance",
+                     value);
         return NULL;
     }
 
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -262,8 +262,8 @@ u_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
 {
     if (!PyUnicode_Check(v)) {
         PyErr_Format(PyExc_TypeError,
-                     "array item must be unicode character, not %s",
-                     Py_TYPE(v)->tp_name);
+                     "array item must be unicode character, not %T",
+                     v);
         return -1;
     }
 
@@ -305,8 +305,8 @@ w_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
 {
     if (!PyUnicode_Check(v)) {
         PyErr_Format(PyExc_TypeError,
-                     "array item must be unicode character, not %s",
-                     Py_TYPE(v)->tp_name);
+                     "array item must be unicode character, not %T",
+                     v);
         return -1;
     }
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -515,8 +515,8 @@ byte_converter(PyObject *arg, char *p)
         return 1;
     }
     PyErr_Format(PyExc_TypeError,
-        "%%c requires an integer in range(256) or a single byte, not %s",
-        Py_TYPE(arg)->tp_name);
+        "%%c requires an integer in range(256) or a single byte, not %T",
+        arg);
     return 0;
 }
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -13989,8 +13989,8 @@ formatchar(PyObject *v)
         if (x == -1 && PyErr_Occurred()) {
             if (PyErr_ExceptionMatches(PyExc_TypeError)) {
                 PyErr_Format(PyExc_TypeError,
-                             "%%c requires int or unicode character, not %s",
-                             Py_TYPE(v)->tp_name);
+                             "%%c requires int or unicode character, not %T",
+                             v);
                 return (Py_UCS4) -1;
             }
             return (Py_UCS4) -1;

Original file line number	Diff line number	Diff line change
`@@ -1137,8 +1137,8 @@ c_set(void ptr, PyObject value, Py_ssize_t size)`
`1137`	`1137`	`}`
`1138`	`1138`	`PyErr_Format(PyExc_TypeError,`
`1139`	`1139`	`"one character bytes, bytearray or integer "`
`1140`		`- "in range(256) expected, not %s",`
`1141`		`- Py_TYPE(value)->tp_name);`
	`1140`	`+ "in range(256) expected, not %T",`
	`1141`	`+ value);`
`1142`	`1142`	`return NULL;`
`1143`	`1143`	`}`
`1144`	`1144`
`@@ -1157,8 +1157,8 @@ u_set(void ptr, PyObject value, Py_ssize_t size)`
`1157`	`1157`	`wchar_t chars[2];`
`1158`	`1158`	`if (!PyUnicode_Check(value)) {`
`1159`	`1159`	`PyErr_Format(PyExc_TypeError,`
`1160`		`- "unicode character expected instead of %s instance",`
`1161`		`- Py_TYPE(value)->tp_name);`
	`1160`	`+ "unicode character expected instead of %T instance",`
	`1161`	`+ value);`
`1162`	`1162`	`return NULL;`
`1163`	`1163`	`}`
`1164`	`1164`
Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,8 @@ u_setitem(arrayobject ap, Py_ssize_t i, PyObject v)`
`262`	`262`	`{`
`263`	`263`	`if (!PyUnicode_Check(v)) {`
`264`	`264`	`PyErr_Format(PyExc_TypeError,`
`265`		`- "array item must be unicode character, not %s",`
`266`		`- Py_TYPE(v)->tp_name);`
	`265`	`+ "array item must be unicode character, not %T",`
	`266`	`+ v);`
`267`	`267`	`return -1;`
`268`	`268`	`}`
`269`	`269`
`@@ -305,8 +305,8 @@ w_setitem(arrayobject ap, Py_ssize_t i, PyObject v)`
`305`	`305`	`{`
`306`	`306`	`if (!PyUnicode_Check(v)) {`
`307`	`307`	`PyErr_Format(PyExc_TypeError,`
`308`		`- "array item must be unicode character, not %s",`
`309`		`- Py_TYPE(v)->tp_name);`
	`308`	`+ "array item must be unicode character, not %T",`
	`309`	`+ v);`
`310`	`310`	`return -1;`
`311`	`311`	`}`
`312`	`312`
Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,8 @@ byte_converter(PyObject arg, char p)`
`515`	`515`	`return 1;`
`516`	`516`	`}`
`517`	`517`	`PyErr_Format(PyExc_TypeError,`
`518`		`- "%%c requires an integer in range(256) or a single byte, not %s",`
`519`		`- Py_TYPE(arg)->tp_name);`
	`518`	`+ "%%c requires an integer in range(256) or a single byte, not %T",`
	`519`	`+ arg);`
`520`	`520`	`return 0;`
`521`	`521`	`}`
`522`	`522`