From 2d0ea7b1a7fedcdcfd2805703bb92f3a2aab4ce6 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Sun, 19 Jan 2025 15:28:24 +0100
Subject: [PATCH] gh-77782: Postpone Py_VerboseFlag removal to Python 3.15

Postpone the global configuration variables removal to Python 3.15.
Do the same for PySys_SetArgvEx(), PySys_SetArgv(),
Py_SetProgramName() and Py_SetPythonHome().
---
 .../c-api-pending-removal-in-3.14.rst         | 64 --------------
 .../c-api-pending-removal-in-3.15.rst         | 83 +++++++++++++++++++
 2 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/Doc/deprecations/c-api-pending-removal-in-3.14.rst b/Doc/deprecations/c-api-pending-removal-in-3.14.rst
index 9e10bf2691e5c8..c805074669811a 100644
--- a/Doc/deprecations/c-api-pending-removal-in-3.14.rst
+++ b/Doc/deprecations/c-api-pending-removal-in-3.14.rst
@@ -6,67 +6,3 @@ Pending removal in Python 3.14
 
 * Creating :c:data:`immutable types <Py_TPFLAGS_IMMUTABLETYPE>` with mutable
   bases (:gh:`95388`).
-
-* Functions to configure Python's initialization, deprecated in Python 3.11:
-
-  * :c:func:`!PySys_SetArgvEx()`:
-    Set :c:member:`PyConfig.argv` instead.
-  * :c:func:`!PySys_SetArgv()`:
-    Set :c:member:`PyConfig.argv` instead.
-  * :c:func:`!Py_SetProgramName()`:
-    Set :c:member:`PyConfig.program_name` instead.
-  * :c:func:`!Py_SetPythonHome()`:
-    Set :c:member:`PyConfig.home` instead.
-
-  The :c:func:`Py_InitializeFromConfig` API should be used with
-  :c:type:`PyConfig` instead.
-
-* Global configuration variables:
-
-  * :c:var:`Py_DebugFlag`:
-    Use :c:member:`PyConfig.parser_debug` instead.
-  * :c:var:`Py_VerboseFlag`:
-    Use :c:member:`PyConfig.verbose` instead.
-  * :c:var:`Py_QuietFlag`:
-    Use :c:member:`PyConfig.quiet` instead.
-  * :c:var:`Py_InteractiveFlag`:
-    Use :c:member:`PyConfig.interactive` instead.
-  * :c:var:`Py_InspectFlag`:
-    Use :c:member:`PyConfig.inspect` instead.
-  * :c:var:`Py_OptimizeFlag`:
-    Use :c:member:`PyConfig.optimization_level` instead.
-  * :c:var:`Py_NoSiteFlag`:
-    Use :c:member:`PyConfig.site_import` instead.
-  * :c:var:`Py_BytesWarningFlag`:
-    Use :c:member:`PyConfig.bytes_warning` instead.
-  * :c:var:`Py_FrozenFlag`:
-    Use :c:member:`PyConfig.pathconfig_warnings` instead.
-  * :c:var:`Py_IgnoreEnvironmentFlag`:
-    Use :c:member:`PyConfig.use_environment` instead.
-  * :c:var:`Py_DontWriteBytecodeFlag`:
-    Use :c:member:`PyConfig.write_bytecode` instead.
-  * :c:var:`Py_NoUserSiteDirectory`:
-    Use :c:member:`PyConfig.user_site_directory` instead.
-  * :c:var:`Py_UnbufferedStdioFlag`:
-    Use :c:member:`PyConfig.buffered_stdio` instead.
-  * :c:var:`Py_HashRandomizationFlag`:
-    Use :c:member:`PyConfig.use_hash_seed`
-    and :c:member:`PyConfig.hash_seed` instead.
-  * :c:var:`Py_IsolatedFlag`:
-    Use :c:member:`PyConfig.isolated` instead.
-  * :c:var:`Py_LegacyWindowsFSEncodingFlag`:
-    Use :c:member:`PyPreConfig.legacy_windows_fs_encoding` instead.
-  * :c:var:`Py_LegacyWindowsStdioFlag`:
-    Use :c:member:`PyConfig.legacy_windows_stdio` instead.
-  * :c:var:`!Py_FileSystemDefaultEncoding`:
-    Use :c:member:`PyConfig.filesystem_encoding` instead.
-  * :c:var:`!Py_HasFileSystemDefaultEncoding`:
-    Use :c:member:`PyConfig.filesystem_encoding` instead.
-  * :c:var:`!Py_FileSystemDefaultEncodeErrors`:
-    Use :c:member:`PyConfig.filesystem_errors` instead.
-  * :c:var:`!Py_UTF8Mode`:
-    Use :c:member:`PyPreConfig.utf8_mode` instead.
-    (see :c:func:`Py_PreInitialize`)
-
-  The :c:func:`Py_InitializeFromConfig` API should be used with
-  :c:type:`PyConfig` instead.
diff --git a/Doc/deprecations/c-api-pending-removal-in-3.15.rst b/Doc/deprecations/c-api-pending-removal-in-3.15.rst
index 0ce0f9c118c094..ba908f81b7f800 100644
--- a/Doc/deprecations/c-api-pending-removal-in-3.15.rst
+++ b/Doc/deprecations/c-api-pending-removal-in-3.15.rst
@@ -25,3 +25,86 @@ Pending removal in Python 3.15
   * :c:func:`Py_GetPythonHome`:
     Get :c:member:`PyConfig.home`
     or the :envvar:`PYTHONHOME` environment variable instead.
+
+* Functions to configure Python's initialization, deprecated in Python 3.11:
+
+  * :c:func:`!PySys_SetArgvEx()`:
+    Set :c:member:`PyConfig.argv` instead.
+  * :c:func:`!PySys_SetArgv()`:
+    Set :c:member:`PyConfig.argv` instead.
+  * :c:func:`!Py_SetProgramName()`:
+    Set :c:member:`PyConfig.program_name` instead.
+  * :c:func:`!Py_SetPythonHome()`:
+    Set :c:member:`PyConfig.home` instead.
+
+  The :c:func:`Py_InitializeFromConfig` API should be used with
+  :c:type:`PyConfig` instead.
+
+* Global configuration variables:
+
+  * :c:var:`Py_DebugFlag`:
+    Use :c:member:`PyConfig.parser_debug` or
+    :c:func:`PyConfig_Get("parser_debug") <PyConfig_Get>` instead.
+  * :c:var:`Py_VerboseFlag`:
+    Use :c:member:`PyConfig.verbose` or
+    :c:func:`PyConfig_Get("verbose") <PyConfig_Get>` instead.
+  * :c:var:`Py_QuietFlag`:
+    Use :c:member:`PyConfig.quiet` or
+    :c:func:`PyConfig_Get("quiet") <PyConfig_Get>` instead.
+  * :c:var:`Py_InteractiveFlag`:
+    Use :c:member:`PyConfig.interactive` or
+    :c:func:`PyConfig_Get("interactive") <PyConfig_Get>` instead.
+  * :c:var:`Py_InspectFlag`:
+    Use :c:member:`PyConfig.inspect` or
+    :c:func:`PyConfig_Get("inspect") <PyConfig_Get>` instead.
+  * :c:var:`Py_OptimizeFlag`:
+    Use :c:member:`PyConfig.optimization_level` or
+    :c:func:`PyConfig_Get("optimization_level") <PyConfig_Get>` instead.
+  * :c:var:`Py_NoSiteFlag`:
+    Use :c:member:`PyConfig.site_import` or
+    :c:func:`PyConfig_Get("site_import") <PyConfig_Get>` instead.
+  * :c:var:`Py_BytesWarningFlag`:
+    Use :c:member:`PyConfig.bytes_warning` or
+    :c:func:`PyConfig_Get("bytes_warning") <PyConfig_Get>` instead.
+  * :c:var:`Py_FrozenFlag`:
+    Use :c:member:`PyConfig.pathconfig_warnings` or
+    :c:func:`PyConfig_Get("pathconfig_warnings") <PyConfig_Get>` instead.
+  * :c:var:`Py_IgnoreEnvironmentFlag`:
+    Use :c:member:`PyConfig.use_environment` or
+    :c:func:`PyConfig_Get("use_environment") <PyConfig_Get>` instead.
+  * :c:var:`Py_DontWriteBytecodeFlag`:
+    Use :c:member:`PyConfig.write_bytecode` or
+    :c:func:`PyConfig_Get("write_bytecode") <PyConfig_Get>` instead.
+  * :c:var:`Py_NoUserSiteDirectory`:
+    Use :c:member:`PyConfig.user_site_directory` or
+    :c:func:`PyConfig_Get("user_site_directory") <PyConfig_Get>` instead.
+  * :c:var:`Py_UnbufferedStdioFlag`:
+    Use :c:member:`PyConfig.buffered_stdio` or
+    :c:func:`PyConfig_Get("buffered_stdio") <PyConfig_Get>` instead.
+  * :c:var:`Py_HashRandomizationFlag`:
+    Use :c:member:`PyConfig.use_hash_seed`
+    and :c:member:`PyConfig.hash_seed` or
+    :c:func:`PyConfig_Get("hash_seed") <PyConfig_Get>` instead.
+  * :c:var:`Py_IsolatedFlag`:
+    Use :c:member:`PyConfig.isolated` or
+    :c:func:`PyConfig_Get("isolated") <PyConfig_Get>` instead.
+  * :c:var:`Py_LegacyWindowsFSEncodingFlag`:
+    Use :c:member:`PyPreConfig.legacy_windows_fs_encoding` or
+    :c:func:`PyConfig_Get("legacy_windows_fs_encoding") <PyConfig_Get>` instead.
+  * :c:var:`Py_LegacyWindowsStdioFlag`:
+    Use :c:member:`PyConfig.legacy_windows_stdio` or
+    :c:func:`PyConfig_Get("legacy_windows_stdio") <PyConfig_Get>` instead.
+  * :c:var:`!Py_FileSystemDefaultEncoding`, :c:var:`!Py_HasFileSystemDefaultEncoding`:
+    Use :c:member:`PyConfig.filesystem_encoding` or
+    :c:func:`PyConfig_Get("filesystem_encoding") <PyConfig_Get>` instead.
+  * :c:var:`!Py_FileSystemDefaultEncodeErrors`:
+    Use :c:member:`PyConfig.filesystem_errors` or
+    :c:func:`PyConfig_Get("filesystem_errors") <PyConfig_Get>` instead.
+  * :c:var:`!Py_UTF8Mode`:
+    Use :c:member:`PyPreConfig.utf8_mode` or
+    :c:func:`PyConfig_Get("utf8_mode") <PyConfig_Get>` instead.
+    (see :c:func:`Py_PreInitialize`)
+
+  The :c:func:`Py_InitializeFromConfig` API should be used with
+  :c:type:`PyConfig` to set these options. Or :c:func:`PyConfig_Get` can be
+  used to get these options at runtime.