Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-03 22:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-129354: Fix grammar in PyErr_FormatUnraisable() (#129475)

Browse source 
Replace "on verb+ing" with "while verb+ing".
This commit is contained in:
Victor Stinner 2025-01-31 09:45:35 +01:00 • committed by GitHub
parent 3ebe3d7688
commit 95504f429e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 79 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/compile.c
View file

@ -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");
}
}

3
Python/crossinterp.c
View file

@ -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();
}

2
Python/errors.c
View file

@ -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;
}

4
Python/gc.c
View file

@ -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;
}

6
Python/gc_free_threading.c
View file

@ -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;
}

15
Python/import.c
View file

@ -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");
}
}

3
Python/jit.c
View file

@ -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");
}
}
}

34
Python/pylifecycle.c
View file

@ -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;
}
}