Skip to content

Commit 95504f4

Browse files
vstinnervstinner
authored
gh-129354: Fix grammar in PyErr_FormatUnraisable() (#129475)
Replace "on verb+ing" with "while verb+ing".
1 parent 3ebe3d7 commit 95504f4

25 files changed

+79
-59
lines changed

‎Lib/test/test_cmd_line.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ def test_stdout_flush_at_shutdown(self):
491491
rc, out, err = assert_python_failure('-c', code)
492492
self.assertEqual(b'', out)
493493
self.assertEqual(120, rc)
494-
self.assertIn(b'Exception ignored on flushing sys.stdout:\n'
494+
self.assertIn(b'Exception ignored while flushing sys.stdout:\n'
495495
b'OSError: '.replace(b'\n', os.linesep.encode()),
496496
err)
497497

‎Lib/test/test_ctypes/test_callbacks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def func():
324324

325325
self.assertIsInstance(cm.unraisable.exc_value, TypeError)
326326
self.assertEqual(cm.unraisable.err_msg,
327-
f"Exception ignored on converting result "
327+
f"Exception ignored while converting result "
328328
f"of ctypes callback function {func!r}")
329329
self.assertIsNone(cm.unraisable.object)
330330

‎Lib/test/test_ctypes/test_random_things.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def expect_unraisable(self, exc_type, exc_msg=None):
5151
if exc_msg is not None:
5252
self.assertEqual(str(cm.unraisable.exc_value), exc_msg)
5353
self.assertEqual(cm.unraisable.err_msg,
54-
f"Exception ignored on calling ctypes "
54+
f"Exception ignored while calling ctypes "
5555
f"callback function {callback_func!r}")
5656
self.assertIsNone(cm.unraisable.object)
5757

‎Lib/test/test_signal.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def handler(signum, frame):
383383
except ZeroDivisionError:
384384
# An ignored exception should have been printed out on stderr
385385
err = err.getvalue()
386-
if ('Exception ignored when trying to write to the signal wakeup fd'
386+
if ('Exception ignored while trying to write to the signal wakeup fd'
387387
not in err):
388388
raise AssertionError(err)
389389
if ('OSError: [Errno %d]' % errno.EBADF) not in err:
@@ -572,7 +572,7 @@ def handler(signum, frame):
572572
signal.raise_signal(signum)
573573
574574
err = err.getvalue()
575-
if ('Exception ignored when trying to {action} to the signal wakeup fd'
575+
if ('Exception ignored while trying to {action} to the signal wakeup fd'
576576
not in err):
577577
raise AssertionError(err)
578578
""".format(action=action)
@@ -642,7 +642,7 @@ def handler(signum, frame):
642642
"buffer" % written)
643643
644644
# By default, we get a warning when a signal arrives
645-
msg = ('Exception ignored when trying to {action} '
645+
msg = ('Exception ignored while trying to {action} '
646646
'to the signal wakeup fd')
647647
signal.set_wakeup_fd(write.fileno())
648648

‎Modules/_ctypes/_ctypes.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ _DictRemover_call(PyObject *myself, PyObject *args, PyObject *kw)
183183
DictRemoverObject *self = _DictRemoverObject_CAST(myself);
184184
if (self->key && self->dict) {
185185
if (-1 == PyDict_DelItem(self->dict, self->key)) {
186-
PyErr_FormatUnraisable("Exception ignored on calling _ctypes.DictRemover");
186+
PyErr_FormatUnraisable("Exception ignored while "
187+
"calling _ctypes.DictRemover");
187188
}
188189
Py_CLEAR(self->key);
189190
Py_CLEAR(self->dict);

‎Modules/_ctypes/callbacks.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ static void _CallPythonObject(ctypes_state *st,
225225

226226
result = PyObject_Vectorcall(callable, args, nargs, NULL);
227227
if (result == NULL) {
228-
PyErr_FormatUnraisable(
229-
"Exception ignored on calling ctypes callback function %R",
230-
callable);
228+
PyErr_FormatUnraisable("Exception ignored while "
229+
"calling ctypes callback function %R",
230+
callable);
231231
}
232232

233233
#ifdef MS_WIN32
@@ -269,7 +269,7 @@ static void _CallPythonObject(ctypes_state *st,
269269
if (keep == NULL) {
270270
/* Could not convert callback result. */
271271
PyErr_FormatUnraisable(
272-
"Exception ignored on converting result "
272+
"Exception ignored while converting result "
273273
"of ctypes callback function %R",
274274
callable);
275275
}
@@ -282,7 +282,7 @@ static void _CallPythonObject(ctypes_state *st,
282282
"memory leak in callback function.",
283283
1) == -1) {
284284
PyErr_FormatUnraisable(
285-
"Exception ignored on converting result "
285+
"Exception ignored while converting result "
286286
"of ctypes callback function %R",
287287
callable);
288288
}

‎Modules/_datetimemodule.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ clear_current_module(PyInterpreterState *interp, PyObject *expected)
226226
goto finally;
227227

228228
error:
229-
PyErr_FormatUnraisable("Exception ignored when clearing _datetime module");
229+
PyErr_FormatUnraisable("Exception ignored while clearing _datetime module");
230230

231231
finally:
232232
PyErr_SetRaisedException(exc);

‎Modules/_lsprof.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,8 @@ profiler_dealloc(ProfilerObject *op)
933933
if (op->flags & POF_ENABLED) {
934934
PyThreadState *tstate = _PyThreadState_GET();
935935
if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {
936-
PyErr_FormatUnraisable("Exception ignored when destroying _lsprof profiler");
936+
PyErr_FormatUnraisable("Exception ignored while "
937+
"destroying _lsprof profiler");
937938
}
938939
}
939940

‎Modules/_testcapi/watchers.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ allocate_too_many_code_watchers(PyObject *self, PyObject *args)
428428
PyObject *exc = PyErr_GetRaisedException();
429429
for (int i = 0; i < num_watchers; i++) {
430430
if (PyCode_ClearWatcher(watcher_ids[i]) < 0) {
431-
PyErr_FormatUnraisable("Exception ignored when "
431+
PyErr_FormatUnraisable("Exception ignored while "
432432
"clearing code watcher");
433433
break;
434434
}
@@ -610,7 +610,7 @@ allocate_too_many_func_watchers(PyObject *self, PyObject *args)
610610
PyObject *exc = PyErr_GetRaisedException();
611611
for (int i = 0; i < num_watchers; i++) {
612612
if (PyFunction_ClearWatcher(watcher_ids[i]) < 0) {
613-
PyErr_FormatUnraisable("Exception ignored when "
613+
PyErr_FormatUnraisable("Exception ignored while "
614614
"clearing function watcher");
615615
break;
616616
}
@@ -757,7 +757,7 @@ allocate_too_many_context_watchers(PyObject *self, PyObject *args)
757757
PyObject *exc = PyErr_GetRaisedException();
758758
for (int i = 0; i < num_watchers; i++) {
759759
if (PyContext_ClearWatcher(watcher_ids[i]) < 0) {
760-
PyErr_FormatUnraisable("Exception ignored when "
760+
PyErr_FormatUnraisable("Exception ignored while "
761761
"clearing context watcher");
762762
break;
763763
}

‎Modules/_winapi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ overlapped_dealloc(OverlappedObject *self)
177177
PyErr_SetString(PyExc_PythonFinalizationError,
178178
"I/O operations still in flight while destroying "
179179
"Overlapped object, the process may crash");
180-
PyErr_FormatUnraisable("Exception ignored when deallocating "
180+
PyErr_FormatUnraisable("Exception ignored while deallocating "
181181
"overlapped operation %R", self);
182182
}
183183
else {

‎Modules/atexitmodule.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ atexit_callfuncs(struct atexit_state *state)
110110
PyObject *copy = PyList_GetSlice(state->callbacks, 0, PyList_GET_SIZE(state->callbacks));
111111
if (copy == NULL)
112112
{
113-
PyErr_FormatUnraisable("Exception ignored when "
113+
PyErr_FormatUnraisable("Exception ignored while "
114114
"copying atexit callbacks");
115115
return;
116116
}

‎Modules/getpath.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
955955
) {
956956
Py_DECREF(co);
957957
Py_DECREF(dict);
958-
PyErr_FormatUnraisable("Exception ignored in preparing getpath");
958+
PyErr_FormatUnraisable("Exception ignored while preparing getpath");
959959
return PyStatus_Error("error evaluating initial values");
960960
}
961961

@@ -964,13 +964,13 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
964964

965965
if (!r) {
966966
Py_DECREF(dict);
967-
PyErr_FormatUnraisable("Exception ignored in running getpath");
967+
PyErr_FormatUnraisable("Exception ignored while running getpath");
968968
return PyStatus_Error("error evaluating path");
969969
}
970970
Py_DECREF(r);
971971

972972
if (_PyConfig_FromDict(config, configDict) < 0) {
973-
PyErr_FormatUnraisable("Exception ignored in reading getpath results");
973+
PyErr_FormatUnraisable("Exception ignored while reading getpath results");
974974
Py_DECREF(dict);
975975
return PyStatus_Error("error getting getpath results");
976976
}

‎Modules/overlapped.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ Overlapped_dealloc(OverlappedObject *self)
759759
PyExc_RuntimeError,
760760
"%R still has pending operation at "
761761
"deallocation, the process may crash", self);
762-
PyErr_FormatUnraisable("Exception ignored when deallocating "
762+
PyErr_FormatUnraisable("Exception ignored while deallocating "
763763
"overlapped operation %R", self);
764764
}
765765
}

‎Modules/signalmodule.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ report_wakeup_write_error(void *data)
245245
errno = (int) (intptr_t) data;
246246
PyObject *exc = PyErr_GetRaisedException();
247247
PyErr_SetFromErrno(PyExc_OSError);
248-
PyErr_FormatUnraisable("Exception ignored when trying to write to the signal wakeup fd");
248+
PyErr_FormatUnraisable("Exception ignored while "
249+
"trying to write to the signal wakeup fd");
249250
PyErr_SetRaisedException(exc);
250251
errno = save_errno;
251252
return 0;
@@ -262,7 +263,8 @@ report_wakeup_send_error(void* data)
262263
recognizes the error codes used by both GetLastError() and
263264
WSAGetLastError */
264265
PyErr_SetExcFromWindowsErr(PyExc_OSError, send_errno);
265-
PyErr_FormatUnraisable("Exception ignored when trying to send to the signal wakeup fd");
266+
PyErr_FormatUnraisable("Exception ignored while "
267+
"trying to send to the signal wakeup fd");
266268
PyErr_SetRaisedException(exc);
267269
return 0;
268270
}
@@ -1837,7 +1839,7 @@ _PyErr_CheckSignalsTstate(PyThreadState *tstate)
18371839
PyErr_Format(PyExc_OSError,
18381840
"Signal %i ignored due to race condition",
18391841
i);
1840-
PyErr_FormatUnraisable("Exception ignored when "
1842+
PyErr_FormatUnraisable("Exception ignored while "
18411843
"calling signal handler");
18421844
continue;
18431845
}

‎Objects/dictobject.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7351,7 +7351,7 @@ PyObject_ClearManagedDict(PyObject *obj)
73517351
if (set_or_clear_managed_dict(obj, NULL, true) < 0) {
73527352
/* Must be out of memory */
73537353
assert(PyErr_Occurred() == PyExc_MemoryError);
7354-
PyErr_FormatUnraisable("Exception ignored when "
7354+
PyErr_FormatUnraisable("Exception ignored while "
73557355
"clearing an object managed dict");
73567356
/* Clear the dict */
73577357
PyDictObject *dict = _PyObject_GetManagedDict(obj);

‎Objects/moduleobject.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,8 @@ _PyModule_ClearDict(PyObject *d)
703703
PyErr_Clear();
704704
}
705705
if (PyDict_SetItem(d, key, Py_None) != 0) {
706-
PyErr_FormatUnraisable("Exception ignored on clearing module dict");
706+
PyErr_FormatUnraisable("Exception ignored while "
707+
"clearing module dict");
707708
}
708709
}
709710
}
@@ -724,7 +725,8 @@ _PyModule_ClearDict(PyObject *d)
724725
PyErr_Clear();
725726
}
726727
if (PyDict_SetItem(d, key, Py_None) != 0) {
727-
PyErr_FormatUnraisable("Exception ignored on clearing module dict");
728+
PyErr_FormatUnraisable("Exception ignored while "
729+
"clearing module dict");
728730
}
729731
}
730732
}

‎Objects/weakrefobject.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,8 @@ PyObject_ClearWeakRefs(PyObject *object)
10421042
PyObject *tuple = PyTuple_New(num_weakrefs * 2);
10431043
if (tuple == NULL) {
10441044
_PyWeakref_ClearWeakRefsNoCallbacks(object);
1045-
PyErr_FormatUnraisable("Exception ignored when clearing object weakrefs");
1045+
PyErr_FormatUnraisable("Exception ignored while "
1046+
"clearing object weakrefs");
10461047
PyErr_SetRaisedException(exc);
10471048
return;
10481049
}

‎Python/compile.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -704,12 +704,12 @@ _PyCompile_ExitScope(compiler *c)
704704
assert(c->u);
705705
/* we are deleting from a list so this really shouldn't fail */
706706
if (PySequence_DelItem(c->c_stack, n) < 0) {
707-
PyErr_FormatUnraisable("Exception ignored on removing "
707+
PyErr_FormatUnraisable("Exception ignored while removing "
708708
"the last compiler stack item");
709709
}
710710
if (nested_seq != NULL) {
711711
if (_PyInstructionSequence_AddNested(c->u->u_instr_sequence, nested_seq) < 0) {
712-
PyErr_FormatUnraisable("Exception ignored on appending "
712+
PyErr_FormatUnraisable("Exception ignored while appending "
713713
"nested instruction sequence");
714714
}
715715
}

‎Python/crossinterp.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,8 @@ _PyXI_excinfo_Apply(_PyXI_excinfo *info, PyObject *exctype)
784784
PyObject *exc = PyErr_GetRaisedException();
785785
if (PyObject_SetAttrString(exc, "_errdisplay", tbexc) < 0) {
786786
#ifdef Py_DEBUG
787-
PyErr_FormatUnraisable("Exception ignored when setting _errdisplay");
787+
PyErr_FormatUnraisable("Exception ignored while "
788+
"setting _errdisplay");
788789
#endif
789790
PyErr_Clear();
790791
}

‎Python/errors.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ format_unraisable_v(const char *format, va_list va, PyObject *obj)
16331633
PyObject *hook_args = make_unraisable_hook_args(
16341634
tstate, exc_type, exc_value, exc_tb, err_msg, obj);
16351635
if (hook_args == NULL) {
1636-
err_msg_str = ("Exception ignored on building "
1636+
err_msg_str = ("Exception ignored while building "
16371637
"sys.unraisablehook arguments");
16381638
goto error;
16391639
}

‎Python/gc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1779,15 +1779,15 @@ do_gc_callback(GCState *gcstate, const char *phase,
17791779
"collected", stats->collected,
17801780
"uncollectable", stats->uncollectable);
17811781
if (info == NULL) {
1782-
PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
1782+
PyErr_FormatUnraisable("Exception ignored while invoking gc callbacks");
17831783
return;
17841784
}
17851785
}
17861786

17871787
PyObject *phase_obj = PyUnicode_FromString(phase);
17881788
if (phase_obj == NULL) {
17891789
Py_XDECREF(info);
1790-
PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
1790+
PyErr_FormatUnraisable("Exception ignored while invoking gc callbacks");
17911791
return;
17921792
}
17931793

‎Python/gc_free_threading.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -1427,15 +1427,17 @@ invoke_gc_callback(PyThreadState *tstate, const char *phase,
14271427
"collected", collected,
14281428
"uncollectable", uncollectable);
14291429
if (info == NULL) {
1430-
PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
1430+
PyErr_FormatUnraisable("Exception ignored while "
1431+
"invoking gc callbacks");
14311432
return;
14321433
}
14331434
}
14341435

14351436
PyObject *phase_obj = PyUnicode_FromString(phase);
14361437
if (phase_obj == NULL) {
14371438
Py_XDECREF(info);
1438-
PyErr_FormatUnraisable("Exception ignored on invoking gc callbacks");
1439+
PyErr_FormatUnraisable("Exception ignored while "
1440+
"invoking gc callbacks");
14391441
return;
14401442
}
14411443

‎Python/import.c

+10-5
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ _PyImport_ClearModulesByIndex(PyInterpreterState *interp)
594594
if (PyList_SetSlice(MODULES_BY_INDEX(interp),
595595
0, PyList_GET_SIZE(MODULES_BY_INDEX(interp)),
596596
NULL)) {
597-
PyErr_FormatUnraisable("Exception ignored on clearing interpreters module list");
597+
PyErr_FormatUnraisable("Exception ignored while "
598+
"clearing interpreters module list");
598599
}
599600
}
600601

@@ -4080,13 +4081,15 @@ _PyImport_FiniCore(PyInterpreterState *interp)
40804081
int verbose = _PyInterpreterState_GetConfig(interp)->verbose;
40814082

40824083
if (_PySys_ClearAttrString(interp, "meta_path", verbose) < 0) {
4083-
PyErr_FormatUnraisable("Exception ignored on clearing sys.meta_path");
4084+
PyErr_FormatUnraisable("Exception ignored while "
4085+
"clearing sys.meta_path");
40844086
}
40854087

40864088
// XXX Pull in most of finalize_modules() in pylifecycle.c.
40874089

40884090
if (_PySys_ClearAttrString(interp, "modules", verbose) < 0) {
4089-
PyErr_FormatUnraisable("Exception ignored on clearing sys.modules");
4091+
PyErr_FormatUnraisable("Exception ignored while "
4092+
"clearing sys.modules");
40904093
}
40914094

40924095
_PyImport_ClearCore(interp);
@@ -4161,10 +4164,12 @@ _PyImport_FiniExternal(PyInterpreterState *interp)
41614164
// XXX Uninstall importlib metapath importers here?
41624165

41634166
if (_PySys_ClearAttrString(interp, "path_importer_cache", verbose) < 0) {
4164-
PyErr_FormatUnraisable("Exception ignored on clearing sys.path_importer_cache");
4167+
PyErr_FormatUnraisable("Exception ignored while "
4168+
"clearing sys.path_importer_cache");
41654169
}
41664170
if (_PySys_ClearAttrString(interp, "path_hooks", verbose) < 0) {
4167-
PyErr_FormatUnraisable("Exception ignored on clearing sys.path_hooks");
4171+
PyErr_FormatUnraisable("Exception ignored while "
4172+
"clearing sys.path_hooks");
41684173
}
41694174
}
41704175

‎Python/jit.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,8 @@ _PyJIT_Free(_PyExecutorObject *executor)
563563
executor->jit_side_entry = NULL;
564564
executor->jit_size = 0;
565565
if (jit_free(memory, size)) {
566-
PyErr_FormatUnraisable("Exception ignored when freeing JIT memory");
566+
PyErr_FormatUnraisable("Exception ignored while "
567+
"freeing JIT memory");
567568
}
568569
}
569570
}

0 commit comments

Comments
 (0)