From: Victor Stinner <vstinner@python.org>
Date: Tue, 4 Feb 2025 15:21:10 +0000 (+0100)
Subject: gh-129354: Use PyErr_FormatUnraisable() function (#129656)
X-Git-Tag: v3.14.0a5~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14489c1bb44dc2f4179278463fedd9a940b63f41;p=thirdparty%2FPython%2Fcpython.git

gh-129354: Use PyErr_FormatUnraisable() function (#129656)

Replace PyErr_WriteUnraisable() with PyErr_FormatUnraisable().
---

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index cf0f1d671b50..f27f2ed48432 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -105,8 +105,10 @@ fileio_dealloc_warn(PyObject *op, PyObject *source)
         PyObject *exc = PyErr_GetRaisedException();
         if (PyErr_ResourceWarning(source, 1, "unclosed file %R", source)) {
             /* Spurious errors can appear at shutdown */
-            if (PyErr_ExceptionMatches(PyExc_Warning))
-                PyErr_WriteUnraisable((PyObject *) self);
+            if (PyErr_ExceptionMatches(PyExc_Warning)) {
+                PyErr_FormatUnraisable("Exception ignored "
+                                       "while finalizing file %R", self);
+            }
         }
         PyErr_SetRaisedException(exc);
     }
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 419e5516b5c1..f87043df1268 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -314,7 +314,8 @@ iobase_finalize(PyObject *self)
             PyErr_Clear();
         res = PyObject_CallMethodNoArgs((PyObject *)self, &_Py_ID(close));
         if (res == NULL) {
-            PyErr_WriteUnraisable(self);
+            PyErr_FormatUnraisable("Exception ignored "
+                                   "while finalizing file %R", self);
         }
         else {
             Py_DECREF(res);
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index b178eb42ac8e..4b6d2dd1c5fc 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5359,7 +5359,8 @@ sock_finalize(PyObject *self)
         if (PyErr_ResourceWarning((PyObject *)s, 1, "unclosed %R", s)) {
             /* Spurious errors can appear at shutdown */
             if (PyErr_ExceptionMatches(PyExc_Warning)) {
-                PyErr_WriteUnraisable((PyObject *)s);
+                PyErr_FormatUnraisable("Exception ignored while "
+                                       "finalizing socket %R", s);
             }
         }