Skip to content

Commit 14489c1

Browse files
authored
gh-129354: Use PyErr_FormatUnraisable() function (#129656)
Replace PyErr_WriteUnraisable() with PyErr_FormatUnraisable().
1 parent 979d766 commit 14489c1

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Modules/_io/fileio.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,10 @@ fileio_dealloc_warn(PyObject *op, PyObject *source)
105105
PyObject *exc = PyErr_GetRaisedException();
106106
if (PyErr_ResourceWarning(source, 1, "unclosed file %R", source)) {
107107
/* Spurious errors can appear at shutdown */
108-
if (PyErr_ExceptionMatches(PyExc_Warning))
109-
PyErr_WriteUnraisable((PyObject *) self);
108+
if (PyErr_ExceptionMatches(PyExc_Warning)) {
109+
PyErr_FormatUnraisable("Exception ignored "
110+
"while finalizing file %R", self);
111+
}
110112
}
111113
PyErr_SetRaisedException(exc);
112114
}

Modules/_io/iobase.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ iobase_finalize(PyObject *self)
314314
PyErr_Clear();
315315
res = PyObject_CallMethodNoArgs((PyObject *)self, &_Py_ID(close));
316316
if (res == NULL) {
317-
PyErr_WriteUnraisable(self);
317+
PyErr_FormatUnraisable("Exception ignored "
318+
"while finalizing file %R", self);
318319
}
319320
else {
320321
Py_DECREF(res);

Modules/socketmodule.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -5359,7 +5359,8 @@ sock_finalize(PyObject *self)
53595359
if (PyErr_ResourceWarning((PyObject *)s, 1, "unclosed %R", s)) {
53605360
/* Spurious errors can appear at shutdown */
53615361
if (PyErr_ExceptionMatches(PyExc_Warning)) {
5362-
PyErr_WriteUnraisable((PyObject *)s);
5362+
PyErr_FormatUnraisable("Exception ignored while "
5363+
"finalizing socket %R", s);
53635364
}
53645365
}
53655366

0 commit comments

Comments
 (0)