gh-114101: Correct PyErr_Format arguments in _testcapi module (#114102)

aisk · web-flow · commit 6c502ba809ff · 2024-01-16T09:32:39.000+01:00
- use PyErr_SetString() iso. PyErr_Format() in parse_tuple_and_keywords()
- fix misspelled format specifier in CHECK_SIGNNESS() macro
diff --git a/Modules/_testcapi/getargs.c b/Modules/_testcapi/getargs.c
@@ -56,9 +56,9 @@ parse_tuple_and_keywords(PyObject *self, PyObject *args)
             keywords[i] = PyBytes_AS_STRING(o);
         }
         else {
-            PyErr_Format(PyExc_ValueError,
+            PyErr_SetString(PyExc_ValueError,
                 "parse_tuple_and_keywords: "
-                "keywords must be str or bytes", i);
+                "keywords must be str or bytes");
             goto exit;
         }
     }
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -112,12 +112,12 @@ test_sizeof_c_types(PyObject *self, PyObject *Py_UNUSED(ignored))
         return (PyObject*)NULL;              \
     }
 #define IS_SIGNED(TYPE) (((TYPE)-1) < (TYPE)0)
-#define CHECK_SIGNNESS(TYPE, SIGNED)         \
-    if (IS_SIGNED(TYPE) != SIGNED) {         \
-        PyErr_Format(get_testerror(self),    \
-            "%s signness is, instead of %i",  \
-            #TYPE, IS_SIGNED(TYPE), SIGNED); \
-        return (PyObject*)NULL;              \
+#define CHECK_SIGNNESS(TYPE, SIGNED)            \
+    if (IS_SIGNED(TYPE) != SIGNED) {            \
+        PyErr_Format(get_testerror(self),       \
+            "%s signness is %i, instead of %i", \
+            #TYPE, IS_SIGNED(TYPE), SIGNED);    \
+        return (PyObject*)NULL;                 \
     }
 
     /* integer types */

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ parse_tuple_and_keywords(PyObject self, PyObject args)`
`56`	`56`	`keywords[i] = PyBytes_AS_STRING(o);`
`57`	`57`	`}`
`58`	`58`	`else {`
`59`		`- PyErr_Format(PyExc_ValueError,`
	`59`	`+ PyErr_SetString(PyExc_ValueError,`
`60`	`60`	`"parse_tuple_and_keywords: "`
`61`		`- "keywords must be str or bytes", i);`
	`61`	`+ "keywords must be str or bytes");`
`62`	`62`	`goto exit;`
`63`	`63`	`}`
`64`	`64`	`}`