From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 10 Nov 2024 00:57:54 +0000 (+0100)
Subject: [3.12] Postpone `module.__loader__` deprecation to Python 3.16 (GH-126482) (#126637)
X-Git-Tag: v3.12.8~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61e6f0992f50a32509e94b050decce70ada8885f;p=thirdparty%2FPython%2Fcpython.git

[3.12] Postpone `module.__loader__` deprecation to Python 3.16 (GH-126482) (#126637)

Postpone `module.__loader__` deprecation to Python 3.16 (GH-126482)
(cherry picked from commit 450db61a78989c5a1f1106be01e071798c783cf9)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---

diff --git a/Doc/deprecations/pending-removal-in-3.14.rst b/Doc/deprecations/pending-removal-in-3.14.rst
index 0e6a100574c3..b506b0f02fbf 100644
--- a/Doc/deprecations/pending-removal-in-3.14.rst
+++ b/Doc/deprecations/pending-removal-in-3.14.rst
@@ -1,13 +1,6 @@
 Pending Removal in Python 3.14
 ------------------------------
 
-* The import system:
-
-  * Setting :attr:`~module.__loader__` on a module while
-    failing to set :attr:`__spec__.loader <importlib.machinery.ModuleSpec.loader>`
-    is deprecated. In Python 3.14, :attr:`!__loader__` will cease to be set or
-    taken into consideration by the import system or the standard library.
-
 * :mod:`argparse`: The *type*, *choices*, and *metavar* parameters
   of :class:`!argparse.BooleanOptionalAction` are deprecated
   and will be removed in 3.14.
diff --git a/Doc/deprecations/pending-removal-in-3.16.rst b/Doc/deprecations/pending-removal-in-3.16.rst
index 82d400915768..f59a40373e48 100644
--- a/Doc/deprecations/pending-removal-in-3.16.rst
+++ b/Doc/deprecations/pending-removal-in-3.16.rst
@@ -1,6 +1,13 @@
 Pending Removal in Python 3.16
 ------------------------------
 
+* The import system:
+
+  * Setting :attr:`~module.__loader__` on a module while
+    failing to set :attr:`__spec__.loader <importlib.machinery.ModuleSpec.loader>`
+    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.
+
 * :mod:`array`:
   :class:`array.array` ``'u'`` type (:c:type:`wchar_t`):
   use the ``'w'`` type instead (``Py_UCS4``).
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index bdb837906536..e19a365fa4bd 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1007,9 +1007,9 @@ this approach.
       using the :class:`types.ModuleType` constructor.
       Previously the attribute was optional.
 
-   .. deprecated-removed:: 3.12 3.14
+   .. deprecated-removed:: 3.12 3.16
       Setting :attr:`!__loader__` on a module while failing to set
-      :attr:`!__spec__.loader` is deprecated. In Python 3.14,
+      :attr:`!__spec__.loader` 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.