Skip to content

Commit

Permalink
gh-102192: deprecate _PyErr_ChainExceptions (#102935)
Browse files Browse the repository at this point in the history
  • Loading branch information
iritkatriel authored Apr 1, 2023
1 parent 848bdbe commit 06249ec
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Doc/whatsnew/3.12.rst
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,10 @@ New Features
This is less error prone and a bit more efficient.
(Contributed by Mark Shannon in :gh:`101578`.)

* Add ``_PyErr_ChainExceptions1``, which takes an exception instance,
to replace the legacy-API ``_PyErr_ChainExceptions``, which is now
deprecated. (Contributed by Mark Shannon in :gh:`101578`.)

* Add :c:func:`PyException_GetArgs` and :c:func:`PyException_SetArgs`
as convenience functions for retrieving and modifying
the :attr:`~BaseException.args` passed to the exception's constructor.
Expand Down Expand Up @@ -1125,6 +1129,8 @@ Deprecated
* :c:func:`!PyErr_Display` is deprecated. Use :c:func:`PyErr_DisplayException`
instead. (Contributed by Irit Katriel in :gh:`102755`).

* ``_PyErr_ChainExceptions`` is deprecated. Use ``_PyErr_ChainExceptions1``
instead. (Contributed by Irit Katriel in :gh:`102192`.)

Removed
-------
Expand Down
2 changes: 1 addition & 1 deletion Include/cpython/pyerrors.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, Py

/* Context manipulation (PEP 3134) */

PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
Py_DEPRECATED(3.12) PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
PyAPI_FUNC(void) _PyErr_ChainExceptions1(PyObject *);

/* Like PyErr_Format(), but saves current exception as __context__ and
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Deprecated ``_PyErr_ChainExceptions`` in favour of
``_PyErr_ChainExceptions1``.

0 comments on commit 06249ec

Please sign in to comment.