From 6f0e2483357ea59520c50604504441d427f49eb5 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Thu, 30 Jan 2025 14:59:22 +0100
Subject: [PATCH] gh-129354: Fix grammar in PyErr_FormatUnraisable()

Replace "on verb+ing" with "while verb+ing".
---
 Lib/test/test_cmd_line.py                  |  2 +-
 Lib/test/test_ctypes/test_callbacks.py     |  2 +-
 Lib/test/test_ctypes/test_random_things.py |  2 +-
 Modules/_ctypes/_ctypes.c                  |  3 +-
 Modules/_ctypes/callbacks.c                | 10 +++----
 Modules/_datetimemodule.c                  |  2 +-
 Modules/_lsprof.c                          |  3 +-
 Modules/_testcapi/watchers.c               |  6 ++--
 Modules/_winapi.c                          |  2 +-
 Modules/atexitmodule.c                     |  2 +-
 Modules/getpath.c                          |  6 ++--
 Modules/overlapped.c                       |  2 +-
 Modules/signalmodule.c                     |  8 +++--
 Objects/dictobject.c                       |  2 +-
 Objects/moduleobject.c                     |  6 ++--
 Objects/weakrefobject.c                    |  3 +-
 Python/compile.c                           |  4 +--
 Python/crossinterp.c                       |  3 +-
 Python/errors.c                            |  2 +-
 Python/gc.c                                |  4 +--
 Python/gc_free_threading.c                 |  6 ++--
 Python/import.c                            | 15 ++++++----
 Python/jit.c                               |  3 +-
 Python/pylifecycle.c                       | 34 ++++++++++++----------
 24 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 24cf357c581096..b949b310ac0f5f 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -491,7 +491,7 @@ def test_stdout_flush_at_shutdown(self):
         rc, out, err = assert_python_failure('-c', code)
         self.assertEqual(b'', out)
         self.assertEqual(120, rc)
-        self.assertIn(b'Exception ignored on flushing sys.stdout:\n'
+        self.assertIn(b'Exception ignored while flushing sys.stdout:\n'
                       b'OSError: '.replace(b'\n', os.linesep.encode()),
                       err)
 
diff --git a/Lib/test/test_ctypes/test_callbacks.py b/Lib/test/test_ctypes/test_callbacks.py
index 8f483dfe1db801..6c7c2e5270736e 100644
--- a/Lib/test/test_ctypes/test_callbacks.py
+++ b/Lib/test/test_ctypes/test_callbacks.py
@@ -324,7 +324,7 @@ def func():
 
             self.assertIsInstance(cm.unraisable.exc_value, TypeError)
             self.assertEqual(cm.unraisable.err_msg,
-                             f"Exception ignored on converting result "
+                             f"Exception ignored while converting result "
                              f"of ctypes callback function {func!r}")
             self.assertIsNone(cm.unraisable.object)
 
diff --git a/Lib/test/test_ctypes/test_random_things.py b/Lib/test/test_ctypes/test_random_things.py
index 630f6ed9489eba..73ff57d925e2ea 100644
--- a/Lib/test/test_ctypes/test_random_things.py
+++ b/Lib/test/test_ctypes/test_random_things.py
@@ -51,7 +51,7 @@ def expect_unraisable(self, exc_type, exc_msg=None):
             if exc_msg is not None:
                 self.assertEqual(str(cm.unraisable.exc_value), exc_msg)
             self.assertEqual(cm.unraisable.err_msg,
-                             f"Exception ignored on calling ctypes "
+                             f"Exception ignored while calling ctypes "
                              f"callback function {callback_func!r}")
             self.assertIsNone(cm.unraisable.object)
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index d86adec0aeca58..606b4636380f11 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -183,7 +183,8 @@ _DictRemover_call(PyObject *myself, PyObject *args, PyObject *kw)
     DictRemoverObject *self = _DictRemoverObject_CAST(myself);
     if (self->key && self->dict) {
         if (-1 == PyDict_DelItem(self->dict, self->key)) {
-            PyErr_FormatUnraisable("Exception ignored on calling _ctypes.DictRemover");
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "calling _ctypes.DictRemover");
         }
         Py_CLEAR(self->key);
         Py_CLEAR(self->dict);
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 591206a78035c5..f2df7052d84fb1 100644
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -225,9 +225,9 @@ static void _CallPythonObject(ctypes_state *st,
 
     result = PyObject_Vectorcall(callable, args, nargs, NULL);
     if (result == NULL) {
-        PyErr_FormatUnraisable(
-                "Exception ignored on calling ctypes callback function %R",
-                callable);
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "calling ctypes callback function %R",
+                               callable);
     }
 
 #ifdef MS_WIN32
@@ -269,7 +269,7 @@ static void _CallPythonObject(ctypes_state *st,
         if (keep == NULL) {
             /* Could not convert callback result. */
             PyErr_FormatUnraisable(
-                    "Exception ignored on converting result "
+                    "Exception ignored while converting result "
                     "of ctypes callback function %R",
                     callable);
         }
@@ -282,7 +282,7 @@ static void _CallPythonObject(ctypes_state *st,
                                   "memory leak in callback function.",
                                   1) == -1) {
                 PyErr_FormatUnraisable(
-                        "Exception ignored on converting result "
+                        "Exception ignored while converting result "
                         "of ctypes callback function %R",
                         callable);
             }
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 9d2abce203be7d..bcbf4217d41a9b 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -226,7 +226,7 @@ clear_current_module(PyInterpreterState *interp, PyObject *expected)
     goto finally;
 
 error:
-    PyErr_FormatUnraisable("Exception ignored when clearing _datetime module");
+    PyErr_FormatUnraisable("Exception ignored while clearing _datetime module");
 
 finally:
     PyErr_SetRaisedException(exc);
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 29d9e5b6ef2cbe..fa1d333ecf3829 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -933,7 +933,8 @@ profiler_dealloc(ProfilerObject *op)
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = _PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {
-            PyErr_FormatUnraisable("Exception ignored when destroying _lsprof profiler");
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "destroying _lsprof profiler");
         }
     }
 
diff --git a/Modules/_testcapi/watchers.c b/Modules/_testcapi/watchers.c
index 17a30355a266f0..f7440769b9594e 100644
--- a/Modules/_testcapi/watchers.c
+++ b/Modules/_testcapi/watchers.c
@@ -428,7 +428,7 @@ allocate_too_many_code_watchers(PyObject *self, PyObject *args)
     PyObject *exc = PyErr_GetRaisedException();
     for (int i = 0; i < num_watchers; i++) {
         if (PyCode_ClearWatcher(watcher_ids[i]) < 0) {
-            PyErr_FormatUnraisable("Exception ignored when "
+            PyErr_FormatUnraisable("Exception ignored while "
                                    "clearing code watcher");
             break;
         }
@@ -610,7 +610,7 @@ allocate_too_many_func_watchers(PyObject *self, PyObject *args)
     PyObject *exc = PyErr_GetRaisedException();
     for (int i = 0; i < num_watchers; i++) {
         if (PyFunction_ClearWatcher(watcher_ids[i]) < 0) {
-            PyErr_FormatUnraisable("Exception ignored when "
+            PyErr_FormatUnraisable("Exception ignored while "
                                    "clearing function watcher");
             break;
         }
@@ -757,7 +757,7 @@ allocate_too_many_context_watchers(PyObject *self, PyObject *args)
     PyObject *exc = PyErr_GetRaisedException();
     for (int i = 0; i < num_watchers; i++) {
         if (PyContext_ClearWatcher(watcher_ids[i]) < 0) {
-            PyErr_FormatUnraisable("Exception ignored when "
+            PyErr_FormatUnraisable("Exception ignored while "
                                    "clearing context watcher");
             break;
         }
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index 56dd38401cb273..786a828f00908c 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -177,7 +177,7 @@ overlapped_dealloc(OverlappedObject *self)
             PyErr_SetString(PyExc_PythonFinalizationError,
                             "I/O operations still in flight while destroying "
                             "Overlapped object, the process may crash");
-            PyErr_FormatUnraisable("Exception ignored when deallocating "
+            PyErr_FormatUnraisable("Exception ignored while deallocating "
                                    "overlapped operation %R", self);
         }
         else {
diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c
index 1dbcc1089c32ab..2bfdda53af8cb2 100644
--- a/Modules/atexitmodule.c
+++ b/Modules/atexitmodule.c
@@ -110,7 +110,7 @@ atexit_callfuncs(struct atexit_state *state)
     PyObject *copy = PyList_GetSlice(state->callbacks, 0, PyList_GET_SIZE(state->callbacks));
     if (copy == NULL)
     {
-        PyErr_FormatUnraisable("Exception ignored when "
+        PyErr_FormatUnraisable("Exception ignored while "
                                "copying atexit callbacks");
         return;
     }
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 2d3c9757298d16..e2478da021f511 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -955,7 +955,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
     ) {
         Py_DECREF(co);
         Py_DECREF(dict);
-        PyErr_FormatUnraisable("Exception ignored in preparing getpath");
+        PyErr_FormatUnraisable("Exception ignored while preparing getpath");
         return PyStatus_Error("error evaluating initial values");
     }
 
@@ -964,13 +964,13 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
 
     if (!r) {
         Py_DECREF(dict);
-        PyErr_FormatUnraisable("Exception ignored in running getpath");
+        PyErr_FormatUnraisable("Exception ignored while running getpath");
         return PyStatus_Error("error evaluating path");
     }
     Py_DECREF(r);
 
     if (_PyConfig_FromDict(config, configDict) < 0) {
-        PyErr_FormatUnraisable("Exception ignored in reading getpath results");
+        PyErr_FormatUnraisable("Exception ignored while reading getpath results");
         Py_DECREF(dict);
         return PyStatus_Error("error getting getpath results");
     }
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 525b288f3ff54d..806ebee7a70ff1 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -759,7 +759,7 @@ Overlapped_dealloc(OverlappedObject *self)
                     PyExc_RuntimeError,
                     "%R still has pending operation at "
                     "deallocation, the process may crash", self);
-                PyErr_FormatUnraisable("Exception ignored when deallocating "
+                PyErr_FormatUnraisable("Exception ignored while deallocating "
                                        "overlapped operation %R", self);
         }
     }
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 0cc9b35300dcca..b679b83bed5365 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -245,7 +245,8 @@ report_wakeup_write_error(void *data)
     errno = (int) (intptr_t) data;
     PyObject *exc = PyErr_GetRaisedException();
     PyErr_SetFromErrno(PyExc_OSError);
-    PyErr_FormatUnraisable("Exception ignored when trying to write to the signal wakeup fd");
+    PyErr_FormatUnraisable("Exception ignored while "
+                           "trying to write to the signal wakeup fd");
     PyErr_SetRaisedException(exc);
     errno = save_errno;
     return 0;
@@ -262,7 +263,8 @@ report_wakeup_send_error(void* data)
        recognizes the error codes used by both GetLastError() and
        WSAGetLastError */
     PyErr_SetExcFromWindowsErr(PyExc_OSError, send_errno);
-    PyErr_FormatUnraisable("Exception ignored when trying to send to the signal wakeup fd");
+    PyErr_FormatUnraisable("Exception ignored while "
+                           "trying to send to the signal wakeup fd");
     PyErr_SetRaisedException(exc);
     return 0;
 }
@@ -1837,7 +1839,7 @@ _PyErr_CheckSignalsTstate(PyThreadState *tstate)
             PyErr_Format(PyExc_OSError,
                          "Signal %i ignored due to race condition",
                          i);
-            PyErr_FormatUnraisable("Exception ignored when "
+            PyErr_FormatUnraisable("Exception ignored while "
                                    "calling signal handler");
             continue;
         }
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index a05359ca0b16ef..91cf013a1dc24b 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -7351,7 +7351,7 @@ PyObject_ClearManagedDict(PyObject *obj)
     if (set_or_clear_managed_dict(obj, NULL, true) < 0) {
         /* Must be out of memory */
         assert(PyErr_Occurred() == PyExc_MemoryError);
-        PyErr_FormatUnraisable("Exception ignored when "
+        PyErr_FormatUnraisable("Exception ignored while "
                                "clearing an object managed dict");
         /* Clear the dict */
         PyDictObject *dict = _PyObject_GetManagedDict(obj);
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index a8d64c9aefae6b..740392b061ba9a 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -703,7 +703,8 @@ _PyModule_ClearDict(PyObject *d)
                         PyErr_Clear();
                 }
                 if (PyDict_SetItem(d, key, Py_None) != 0) {
-                    PyErr_FormatUnraisable("Exception ignored on clearing module dict");
+                    PyErr_FormatUnraisable("Exception ignored while "
+                                           "clearing module dict");
                 }
             }
         }
@@ -724,7 +725,8 @@ _PyModule_ClearDict(PyObject *d)
                         PyErr_Clear();
                 }
                 if (PyDict_SetItem(d, key, Py_None) != 0) {
-                    PyErr_FormatUnraisable("Exception ignored on clearing module dict");
+                    PyErr_FormatUnraisable("Exception ignored while "
+                                           "clearing module dict");
                 }
             }
         }
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 8ced82ef36e30d..05ae43d1df475b 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -1042,7 +1042,8 @@ PyObject_ClearWeakRefs(PyObject *object)
     PyObject *tuple = PyTuple_New(num_weakrefs * 2);
     if (tuple == NULL) {
         _PyWeakref_ClearWeakRefsNoCallbacks(object);
-        PyErr_FormatUnraisable("Exception ignored when clearing object weakrefs");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "clearing object weakrefs");
         PyErr_SetRaisedException(exc);
         return;
     }
diff --git a/Python/compile.c b/Python/compile.c
index ef470830336dde..b58c12d4b881ac 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -704,12 +704,12 @@ _PyCompile_ExitScope(compiler *c)
         assert(c->u);
         /* we are deleting from a list so this really shouldn't fail */
         if (PySequence_DelItem(c->c_stack, n) < 0) {
-            PyErr_FormatUnraisable("Exception ignored on removing "
+            PyErr_FormatUnraisable("Exception ignored while removing "
                                    "the last compiler stack item");
         }
         if (nested_seq != NULL) {
             if (_PyInstructionSequence_AddNested(c->u->u_instr_sequence, nested_seq) < 0) {
-                PyErr_FormatUnraisable("Exception ignored on appending "
+                PyErr_FormatUnraisable("Exception ignored while appending "
                                        "nested instruction sequence");
             }
         }
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index 0a106ad636bfe8..7eb5bc267487d1 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -784,7 +784,8 @@ _PyXI_excinfo_Apply(_PyXI_excinfo *info, PyObject *exctype)
         PyObject *exc = PyErr_GetRaisedException();
         if (PyObject_SetAttrString(exc, "_errdisplay", tbexc) < 0) {
 #ifdef Py_DEBUG
-            PyErr_FormatUnraisable("Exception ignored when setting _errdisplay");
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "setting _errdisplay");
 #endif
             PyErr_Clear();
         }
diff --git a/Python/errors.c b/Python/errors.c
index 9c7b771133dcf4..0a19d898da75d7 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1633,7 +1633,7 @@ format_unraisable_v(const char *format, va_list va, PyObject *obj)
     PyObject *hook_args = make_unraisable_hook_args(
         tstate, exc_type, exc_value, exc_tb, err_msg, obj);
     if (hook_args == NULL) {
-        err_msg_str = ("Exception ignored on building "
+        err_msg_str = ("Exception ignored while building "
                        "sys.unraisablehook arguments");
         goto error;
     }
diff --git a/Python/gc.c b/Python/gc.c
index 3fe0b7f814544d..420240fc3020be 100644
--- a/Python/gc.c
+++ b/Python/gc.c
@@ -1779,7 +1779,7 @@ do_gc_callback(GCState *gcstate, const char *phase,
             "collected", stats->collected,
             "uncollectable", stats->uncollectable);
         if (info == NULL) {
-            PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
+            PyErr_FormatUnraisable("Exception ignored while invoking gc callbacks");
             return;
         }
     }
@@ -1787,7 +1787,7 @@ do_gc_callback(GCState *gcstate, const char *phase,
     PyObject *phase_obj = PyUnicode_FromString(phase);
     if (phase_obj == NULL) {
         Py_XDECREF(info);
-        PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
+        PyErr_FormatUnraisable("Exception ignored while invoking gc callbacks");
         return;
     }
 
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
index 211d52d6cc7164..905a14f660ec6c 100644
--- a/Python/gc_free_threading.c
+++ b/Python/gc_free_threading.c
@@ -1427,7 +1427,8 @@ invoke_gc_callback(PyThreadState *tstate, const char *phase,
             "collected", collected,
             "uncollectable", uncollectable);
         if (info == NULL) {
-            PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "invoking gc callbacks");
             return;
         }
     }
@@ -1435,7 +1436,8 @@ invoke_gc_callback(PyThreadState *tstate, const char *phase,
     PyObject *phase_obj = PyUnicode_FromString(phase);
     if (phase_obj == NULL) {
         Py_XDECREF(info);
-        PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "invoking gc callbacks");
         return;
     }
 
diff --git a/Python/import.c b/Python/import.c
index dd7a0b4b1ed8de..8cc8d3a503bffa 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -594,7 +594,8 @@ _PyImport_ClearModulesByIndex(PyInterpreterState *interp)
     if (PyList_SetSlice(MODULES_BY_INDEX(interp),
                         0, PyList_GET_SIZE(MODULES_BY_INDEX(interp)),
                         NULL)) {
-        PyErr_FormatUnraisable("Exception ignored on clearing interpreters module list");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "clearing interpreters module list");
     }
 }
 
@@ -4080,13 +4081,15 @@ _PyImport_FiniCore(PyInterpreterState *interp)
     int verbose = _PyInterpreterState_GetConfig(interp)->verbose;
 
     if (_PySys_ClearAttrString(interp, "meta_path", verbose) < 0) {
-        PyErr_FormatUnraisable("Exception ignored on clearing sys.meta_path");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "clearing sys.meta_path");
     }
 
     // XXX Pull in most of finalize_modules() in pylifecycle.c.
 
     if (_PySys_ClearAttrString(interp, "modules", verbose) < 0) {
-        PyErr_FormatUnraisable("Exception ignored on clearing sys.modules");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "clearing sys.modules");
     }
 
     _PyImport_ClearCore(interp);
@@ -4161,10 +4164,12 @@ _PyImport_FiniExternal(PyInterpreterState *interp)
     // XXX Uninstall importlib metapath importers here?
 
     if (_PySys_ClearAttrString(interp, "path_importer_cache", verbose) < 0) {
-        PyErr_FormatUnraisable("Exception ignored on clearing sys.path_importer_cache");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "clearing sys.path_importer_cache");
     }
     if (_PySys_ClearAttrString(interp, "path_hooks", verbose) < 0) {
-        PyErr_FormatUnraisable("Exception ignored on clearing sys.path_hooks");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "clearing sys.path_hooks");
     }
 }
 
diff --git a/Python/jit.c b/Python/jit.c
index 4b01112f9b0a5a..33c2418084b1fd 100644
--- a/Python/jit.c
+++ b/Python/jit.c
@@ -563,7 +563,8 @@ _PyJIT_Free(_PyExecutorObject *executor)
         executor->jit_side_entry = NULL;
         executor->jit_size = 0;
         if (jit_free(memory, size)) {
-            PyErr_FormatUnraisable("Exception ignored when freeing JIT memory");
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "freeing JIT memory");
         }
     }
 }
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 7031d743174650..300a871d2cc4bf 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1475,13 +1475,15 @@ finalize_modules_delete_special(PyThreadState *tstate, int verbose)
         PySys_WriteStderr("# clear builtins._\n");
     }
     if (PyDict_SetItemString(interp->builtins, "_", Py_None) < 0) {
-        PyErr_FormatUnraisable("Exception ignored on setting builtin variable _");
+        PyErr_FormatUnraisable("Exception ignored while "
+                               "setting builtin variable _");
     }
 
     const char * const *p;
     for (p = sys_deletes; *p != NULL; p++) {
         if (_PySys_ClearAttrString(interp, *p, verbose) < 0) {
-            PyErr_FormatUnraisable("Exception ignored on clearing sys.%s", *p);
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "clearing sys.%s", *p);
         }
     }
     for (p = sys_files; *p != NULL; p+=2) {
@@ -1492,13 +1494,15 @@ finalize_modules_delete_special(PyThreadState *tstate, int verbose)
         }
         PyObject *value;
         if (PyDict_GetItemStringRef(interp->sysdict, orig_name, &value) < 0) {
-            PyErr_FormatUnraisable("Exception ignored on restoring sys.%s", name);
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "restoring sys.%s", name);
         }
         if (value == NULL) {
             value = Py_NewRef(Py_None);
         }
         if (PyDict_SetItemString(interp->sysdict, name, value) < 0) {
-            PyErr_FormatUnraisable("Exception ignored on restoring sys.%s", name);
+            PyErr_FormatUnraisable("Exception ignored while "
+                                   "restoring sys.%s", name);
         }
         Py_DECREF(value);
     }
@@ -1510,7 +1514,7 @@ finalize_remove_modules(PyObject *modules, int verbose)
 {
     PyObject *weaklist = PyList_New(0);
     if (weaklist == NULL) {
-        PyErr_FormatUnraisable("Exception ignored on removing modules");
+        PyErr_FormatUnraisable("Exception ignored while removing modules");
     }
 
 #define STORE_MODULE_WEAKREF(name, mod) \
@@ -1519,13 +1523,13 @@ finalize_remove_modules(PyObject *modules, int verbose)
             if (wr) { \
                 PyObject *tup = PyTuple_Pack(2, name, wr); \
                 if (!tup || PyList_Append(weaklist, tup) < 0) { \
-                    PyErr_FormatUnraisable("Exception ignored on removing modules"); \
+                    PyErr_FormatUnraisable("Exception ignored while removing modules"); \
                 } \
                 Py_XDECREF(tup); \
                 Py_DECREF(wr); \
             } \
             else { \
-                PyErr_FormatUnraisable("Exception ignored on removing modules"); \
+                PyErr_FormatUnraisable("Exception ignored while removing modules"); \
             } \
         }
 
@@ -1536,7 +1540,7 @@ finalize_remove_modules(PyObject *modules, int verbose)
             } \
             STORE_MODULE_WEAKREF(name, mod); \
             if (PyObject_SetItem(modules, name, Py_None) < 0) { \
-                PyErr_FormatUnraisable("Exception ignored on removing modules"); \
+                PyErr_FormatUnraisable("Exception ignored while removing modules"); \
             } \
         }
 
@@ -1550,14 +1554,14 @@ finalize_remove_modules(PyObject *modules, int verbose)
     else {
         PyObject *iterator = PyObject_GetIter(modules);
         if (iterator == NULL) {
-            PyErr_FormatUnraisable("Exception ignored on removing modules");
+            PyErr_FormatUnraisable("Exception ignored while removing modules");
         }
         else {
             PyObject *key;
             while ((key = PyIter_Next(iterator))) {
                 PyObject *value = PyObject_GetItem(modules, key);
                 if (value == NULL) {
-                    PyErr_FormatUnraisable("Exception ignored on removing modules");
+                    PyErr_FormatUnraisable("Exception ignored while removing modules");
                     continue;
                 }
                 CLEAR_MODULE(key, value);
@@ -1565,7 +1569,7 @@ finalize_remove_modules(PyObject *modules, int verbose)
                 Py_DECREF(key);
             }
             if (PyErr_Occurred()) {
-                PyErr_FormatUnraisable("Exception ignored on removing modules");
+                PyErr_FormatUnraisable("Exception ignored while removing modules");
             }
             Py_DECREF(iterator);
         }
@@ -1585,7 +1589,7 @@ finalize_clear_modules_dict(PyObject *modules)
     }
     else {
         if (PyObject_CallMethodNoArgs(modules, &_Py_ID(clear)) == NULL) {
-            PyErr_FormatUnraisable("Exception ignored on clearing sys.modules");
+            PyErr_FormatUnraisable("Exception ignored while clearing sys.modules");
         }
     }
 }
@@ -1597,11 +1601,11 @@ finalize_restore_builtins(PyThreadState *tstate)
     PyInterpreterState *interp = tstate->interp;
     PyObject *dict = PyDict_Copy(interp->builtins);
     if (dict == NULL) {
-        PyErr_FormatUnraisable("Exception ignored on restoring builtins");
+        PyErr_FormatUnraisable("Exception ignored while restoring builtins");
     }
     PyDict_Clear(interp->builtins);
     if (PyDict_Update(interp->builtins, interp->builtins_copy)) {
-        PyErr_FormatUnraisable("Exception ignored on restoring builtins");
+        PyErr_FormatUnraisable("Exception ignored while restoring builtins");
     }
     Py_XDECREF(dict);
 }
@@ -1773,7 +1777,7 @@ flush_std_files(void)
 
     if (fout != NULL && fout != Py_None && !file_is_closed(fout)) {
         if (_PyFile_Flush(fout) < 0) {
-            PyErr_FormatUnraisable("Exception ignored on flushing sys.stdout");
+            PyErr_FormatUnraisable("Exception ignored while flushing sys.stdout");
             status = -1;
         }
     }