Tidy up 3.15 pending removals

Author: StanFromIreland

Doc/deprecations/c-api-pending-removal-in-3.16.rst

@@ -1,4 +1,87 @@
 Pending removal in Python 3.16
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* The bundled copy of ``libmpdec``.
+* 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.
+  * :c:func:`!PySys_ResetWarnOptions`:
+    Clear :data:`sys.warnoptions` and :data:`!warnings.filters` 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.

Doc/deprecations/index.rst

@@ -1,8 +1,6 @@
 Deprecations
 ============
 
-.. include:: pending-removal-in-3.15.rst
-
 .. include:: pending-removal-in-3.16.rst
 
 .. include:: pending-removal-in-3.17.rst
@@ -20,8 +18,6 @@ Deprecations
 C API deprecations
 ------------------
 
-.. include:: c-api-pending-removal-in-3.15.rst
-
 .. include:: c-api-pending-removal-in-3.16.rst
 
 .. include:: c-api-pending-removal-in-3.18.rst

Doc/deprecations/pending-removal-in-3.15.rst

@@ -8,11 +8,6 @@ Pending removal in Python 3.15
     is deprecated. In Python 3.15, ``__cached__`` will cease to be set or
     take into consideration by the import system or standard library. (:gh:`97879`)
 
-  * Setting :attr:`~module.__package__` on a module while
-    failing to set :attr:`__spec__.parent <importlib.machinery.ModuleSpec.parent>`
-    is deprecated. In Python 3.15, :attr:`!__package__` will cease to be set or
-    take into consideration by the import system or standard library. (:gh:`97879`)
-
 * :mod:`ctypes`:
 
   * The undocumented :func:`!ctypes.SetPointerType` function

Doc/deprecations/pending-removal-in-3.16.rst

@@ -8,6 +8,13 @@ Pending removal in Python 3.16
     is deprecated. In Python 3.16, :attr:`!__loader__` will cease to be set or
     taken into consideration by the import system or the standard library.
 
+  * Setting :attr:`~module.__package__` on a module while
+    failing to set :attr:`__spec__.parent <importlib.machinery.ModuleSpec.parent>`
+    is deprecated. In Python 3.15, :attr:`!__package__` will cease to be set or
+    take into consideration by the import system or standard library. (:gh:`97879`)
+
+* The bundled copy of ``libmpdec``.
+
 * :mod:`array`:
 
   * The ``'u'`` format code (:c:type:`wchar_t`)