https://github.com/python/cpython/commit/6c502ba809ff662a5eebf8c6778dec6bd28918fb
commit: 6c502ba809ff662a5eebf8c6778dec6bd28918fb
branch: main
author: AN Long <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-01-16T09:32:39+01:00
summary:
gh-114101: Correct PyErr_Format arguments in _testcapi module (#114102)
- use PyErr_SetString() iso. PyErr_Format() in parse_tuple_and_keywords()
- fix misspelled format specifier in CHECK_SIGNNESS() macro
files:
M Modules/_testcapi/getargs.c
M Modules/_testcapimodule.c
diff --git a/Modules/_testcapi/getargs.c b/Modules/_testcapi/getargs.c
index 33e8af7d7bbb39..0d61d8c8969f82 100644
--- 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
index a0b21b7efbd971..6def680190b1a6 100644
--- 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 */
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
