gh-138886: Remove deprecated PySys_ResetWarnOptions C-API function

sobolevn · sobolevn · commit 3d0a94fee363 · 2025-09-14T13:11:33.000+03:00
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
@@ -41,7 +41,7 @@ The following functions can be safely called before Python is initialized:
   * :c:func:`PyObject_SetArenaAllocator`
   * :c:func:`Py_SetProgramName`
   * :c:func:`Py_SetPythonHome`
-  * :c:func:`PySys_ResetWarnOptions`
+  * :c:func:`!PySys_ResetWarnOptions`
   * the configuration functions covered in :ref:`init-config`
 
 * Informative functions:
diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst
@@ -316,14 +316,6 @@ accessible to C code.  They all work with the current interpreter thread's
    case *name* is deleted from the sys module. Returns ``0`` on success, ``-1``
    on error.
 
-.. c:function:: void PySys_ResetWarnOptions()
-
-   Reset :data:`sys.warnoptions` to an empty list. This function may be
-   called prior to :c:func:`Py_Initialize`.
-
-   .. deprecated-removed:: 3.13 3.15
-      Clear :data:`sys.warnoptions` and :data:`!warnings.filters` instead.
-
 .. c:function:: void PySys_WriteStdout(const char *format, ...)
 
    Write the output string described by *format* to :data:`sys.stdout`.  No
diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -2490,7 +2490,7 @@ Deprecated C APIs
 
 * Deprecate old Python initialization functions:
 
-  * :c:func:`PySys_ResetWarnOptions`:
+  * :c:func:`!PySys_ResetWarnOptions`:
     Clear :data:`sys.warnoptions` and :data:`!warnings.filters` instead.
   * :c:func:`!Py_GetExecPrefix`:
     Get :data:`sys.exec_prefix` instead.
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
@@ -800,6 +800,11 @@ Removed C APIs
   of :c:func:`PyImport_ImportModule`.
   (Contributed by Bénédikt Tran in :gh:`133644`.)
 
+* Remove deprecated :c:func:`!PySys_ResetWarnOptions`.
+  Clear :data:`sys.warnoptions` and :data:`!warnings.filters` instead.
+
+  (Contributed by Nikita Sobolev in :gh:`138886`.)
+
 The following functions are removed in favor of :c:func:`PyConfig_Get`.
 The |pythoncapi_compat_project| can be used to get :c:func:`!PyConfig_Get`
 on Python 3.13 and older.
diff --git a/Include/sysmodule.h b/Include/sysmodule.h
@@ -23,8 +23,6 @@ PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
 PyAPI_FUNC(void) PySys_FormatStdout(const char *format, ...);
 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);
 
-Py_DEPRECATED(3.13) PyAPI_FUNC(void) PySys_ResetWarnOptions(void);
-
 PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
 
 #ifdef __cplusplus
diff --git a/Misc/NEWS.d/next/C_API/2025-09-14-13-09-47.gh-issue-138886.dlcTXL.rst b/Misc/NEWS.d/next/C_API/2025-09-14-13-09-47.gh-issue-138886.dlcTXL.rst
@@ -0,0 +1 @@
+Remove deprecated :c:func:`PySys_ResetWarnOptions` C-API function.
diff --git a/Misc/stable_abi.toml b/Misc/stable_abi.toml
@@ -1335,6 +1335,7 @@
     abi_only = true
 [function.PySys_ResetWarnOptions]
     added = '3.2'
+    abi_only = true
 [function.PySys_SetArgv]
     added = '3.2'
 [function.PySys_SetArgvEx]
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -343,12 +343,9 @@ static int test_pre_initialization_sys_options(void)
 
     _Py_EMBED_PREINIT_CHECK("Checking PySys_AddWarnOption\n");
     PySys_AddWarnOption(L"default");
-    _Py_EMBED_PREINIT_CHECK("Checking PySys_ResetWarnOptions\n");
-    PySys_ResetWarnOptions();
     _Py_EMBED_PREINIT_CHECK("Checking PySys_AddWarnOption linked list\n");
     PySys_AddWarnOption(dynamic_once_warnoption);
     PySys_AddWarnOption(L"module");
-    PySys_AddWarnOption(L"default");
     _Py_EMBED_PREINIT_CHECK("Checking PySys_AddXOption\n");
     PySys_AddXOption(L"not_an_option=1");
     PySys_AddXOption(dynamic_xoption);
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -3045,7 +3045,7 @@ get_warnoptions(PyThreadState *tstate)
     return warnoptions;
 }
 
-void
+PyAPI_FUNC(void)
 PySys_ResetWarnOptions(void)
 {
     PyThreadState *tstate = _PyThreadState_GET();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Remove deprecated :c:func:`PySys_ResetWarnOptions` C-API function.
Original file line number	Diff line number	Diff line change
`@@ -3045,7 +3045,7 @@ get_warnoptions(PyThreadState *tstate)`
`3045`	`3045`	`return warnoptions;`
`3046`	`3046`	`}`
`3047`	`3047`
`3048`		`-void`
	`3048`	`+PyAPI_FUNC(void)`
`3049`	`3049`	`PySys_ResetWarnOptions(void)`
`3050`	`3050`	`{`
`3051`	`3051`	`PyThreadState *tstate = _PyThreadState_GET();`