gh-116809: Restore removed _PyErr_ChainExceptions1() function (#116900)

diff --git a/Include/cpython/pyerrors.h b/Include/cpython/pyerrors.h
index 32c5884cd21341c1b8ac7807f9c86ba0b350d535..42b4b03b10ca20f14dd557c392a367d3a27d4842 100644 (file)
--- a/Include/cpython/pyerrors.h
+++ b/Include/cpython/pyerrors.h
@@ -88,6 +88,10 @@ typedef PyOSErrorObject PyEnvironmentErrorObject;
 typedef PyOSErrorObject PyWindowsErrorObject;
 #endif
 
+/* Context manipulation (PEP 3134) */
+
+PyAPI_FUNC(void) _PyErr_ChainExceptions1(PyObject *);
+
 /* In exceptions.c */
 
 PyAPI_FUNC(PyObject*) PyUnstable_Exc_PrepReraiseStar(

diff --git a/Include/internal/pycore_pyerrors.h b/Include/internal/pycore_pyerrors.h
index 910335fd2cf33b7ed7fe5c3b0efc6e3a9ad8f267..683d87a0d0b12928214893dc4e8edbfc76dbc21f 100644 (file)
--- a/Include/internal/pycore_pyerrors.h
+++ b/Include/internal/pycore_pyerrors.h
@@ -167,9 +167,6 @@ void _PyErr_FormatNote(const char *format, ...);
 
 Py_DEPRECATED(3.12) extern void _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
 
-// Export for '_zoneinfo' shared extension
-PyAPI_FUNC(void) _PyErr_ChainExceptions1(PyObject *);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/Misc/NEWS.d/next/C API/2024-03-16-12-21-00.gh-issue-116809.JL786L.rst b/Misc/NEWS.d/next/C API/2024-03-16-12-21-00.gh-issue-116809.JL786L.rst
new file mode 100644 (file)
index 0000000..a122e1b
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2024-03-16-12-21-00.gh-issue-116809.JL786L.rst
@@ -0,0 +1,2 @@
+Restore removed private ``_PyErr_ChainExceptions1()`` function. Patch by
+Victor Stinner.