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

vstinner · web-flow · commit 5e0a070dfe33 · 2024-03-16T21:37:11.000+01:00
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+Restore removed private ``_PyErr_ChainExceptions1()`` function. Patch by
+Victor Stinner.

Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,6 @@ void _PyErr_FormatNote(const char *format, ...);`
`167`	`167`
`168`	`168`	`Py_DEPRECATED(3.12) extern void _PyErr_ChainExceptions(PyObject , PyObject , PyObject *);`
`169`	`169`
`170`		`-// Export for '_zoneinfo' shared extension`
`171`		`-PyAPI_FUNC(void) _PyErr_ChainExceptions1(PyObject *);`
`172`		`-`
`173`	`170`	`#ifdef __cplusplus`
`174`	`171`	`}`
`175`	`172`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Restore removed private ``_PyErr_ChainExceptions1()`` function. Patch by
	`2`	`+Victor Stinner.`