From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 25 Jun 2022 16:02:09 +0000 (+0300)
Subject: gh-77560: Report possible errors in restoring builtins at finalization (GH-94255)
X-Git-Tag: v3.12.0a1~1119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bec802dbb87717a23acb9c600c15f40bc98340a3;p=thirdparty%2FPython%2Fcpython.git

gh-77560: Report possible errors in restoring builtins at finalization (GH-94255)

Seems in the past the copy of builtins was not made in some scenarios,
and the error was silenced. Write it now to stderr, so we have a chance
to see it.
---

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index c2c9e90d0562..65e7f23e963b 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1462,7 +1462,7 @@ finalize_restore_builtins(PyThreadState *tstate)
     }
     PyDict_Clear(interp->builtins);
     if (PyDict_Update(interp->builtins, interp->builtins_copy)) {
-        _PyErr_Clear(tstate);
+        PyErr_WriteUnraisable(NULL);
     }
     Py_XDECREF(dict);
 }