Skip to content

gh-108082: Add PyErr_FormatUnraisable() function #111086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 6 commits into from
Oct 31, 2023
Merged

gh-108082: Add PyErr_FormatUnraisable() function #111086

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de02658
gh-108082: Add PyErr_FormatUnraisable() function
serhiy-storchaka Aug 12, 2023
20a11b3
Merge branch 'main' into capi-PyErr_FormatUnraisable
serhiy-storchaka Oct 29, 2023
bceb8c5
Remove from the limited C API.
serhiy-storchaka Oct 29, 2023
bda2510
Merge branch 'main' into capi-PyErr_FormatUnraisable
serhiy-storchaka Oct 30, 2023
38b5ba2
Merge branch 'main' into capi-PyErr_FormatUnraisable
serhiy-storchaka Oct 31, 2023
b7d68e7
Address review comments.
serhiy-storchaka Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into capi-PyErr_FormatUnraisable
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Oct 30, 2023
commit bda2510a3417260c1666e6a9429f1251375bcdeb
6 changes: 6 additions & 0 deletions Doc/c-api/exceptions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ Printing and clearing

An exception must be set when calling this function.

.. versionchanged:: 3.4
Print a traceback. Print only traceback if *obj* is ``NULL``.

.. versionchanged:: 3.8
Use :func:`sys.unraisablehook`.


.. c:function:: void PyErr_FormatUnraisable(const char *format, ...)

Expand Down
6 changes: 2 additions & 4 deletions Modules/_testcapi/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@ err_writeunraisable(PyObject *Py_UNUSED(module), PyObject *args)
NULLABLE(exc);
NULLABLE(obj);
if (exc) {
Py_INCREF(exc);
PyErr_SetRaisedException(exc);
PyErr_SetRaisedException(Py_NewRef(exc));
}
PyErr_WriteUnraisable(obj);
Py_RETURN_NONE;
Expand All @@ -336,8 +335,7 @@ err_formatunraisable(PyObject *Py_UNUSED(module), PyObject *args)
}
NULLABLE(exc);
if (exc) {
Py_INCREF(exc);
PyErr_SetRaisedException(exc);
PyErr_SetRaisedException(Py_NewRef(exc));
}
PyErr_FormatUnraisable(fmt,
objs[0], objs[1], objs[2], objs[3], objs[4],
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.