From 5e90e7f87266ff8652792d81b3f4d8765ffb6aaf Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Mon, 4 Nov 2024 18:49:59 +0200
Subject: [PATCH] [3.12] gh-101865: Docs: Keep co_lnotab deprecation for at
 least 3.14 (GH-126392) (cherry picked from commit
 eac41c5ddfadf52fbd84ee898ad56aedd5d90a41)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 Doc/deprecations/pending-removal-in-3.14.rst |  7 -------
 Doc/deprecations/pending-removal-in-3.15.rst | 11 +++++++++++
 Doc/reference/datamodel.rst                  |  2 +-
 Doc/whatsnew/3.12.rst                        |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Doc/deprecations/pending-removal-in-3.14.rst b/Doc/deprecations/pending-removal-in-3.14.rst
index 7eaa80e96138af..0e6a100574c3be 100644
--- a/Doc/deprecations/pending-removal-in-3.14.rst
+++ b/Doc/deprecations/pending-removal-in-3.14.rst
@@ -106,13 +106,6 @@ Pending Removal in Python 3.14
     if :ref:`named placeholders <sqlite3-placeholders>` are used and
     *parameters* is a sequence instead of a :class:`dict`.
 
-* :class:`types.CodeType`: Accessing :attr:`~codeobject.co_lnotab` was
-  deprecated in :pep:`626`
-  since 3.10 and was planned to be removed in 3.12,
-  but it only got a proper :exc:`DeprecationWarning` in 3.12.
-  May be removed in 3.14.
-  (Contributed by Nikita Sobolev in :gh:`101866`.)
-
 * :mod:`typing`: :class:`~typing.ByteString`, deprecated since Python 3.9,
   now causes a :exc:`DeprecationWarning` to be emitted when it is used.
 
diff --git a/Doc/deprecations/pending-removal-in-3.15.rst b/Doc/deprecations/pending-removal-in-3.15.rst
index f9d1d4564b984c..182a72b2e1a5b2 100644
--- a/Doc/deprecations/pending-removal-in-3.15.rst
+++ b/Doc/deprecations/pending-removal-in-3.15.rst
@@ -37,6 +37,17 @@ Pending Removal in Python 3.15
     (``NT = NamedTuple("NT", x=int)``) is deprecated, and will be disallowed in
     3.15. Use the class-based syntax or the functional syntax instead.
 
+* :mod:`types`:
+
+  * :class:`types.CodeType`: Accessing :attr:`~codeobject.co_lnotab` was
+    deprecated in :pep:`626`
+    since 3.10 and was planned to be removed in 3.12,
+    but it only got a proper :exc:`DeprecationWarning` in 3.12.
+    May be removed in 3.15.
+    (Contributed by Nikita Sobolev in :gh:`101866`.)
+
+* :mod:`typing`:
+
   * When using the functional syntax to create a :class:`!NamedTuple` class, failing to
     pass a value to the *fields* parameter (``NT = NamedTuple("NT")``) is
     deprecated. Passing ``None`` to the *fields* parameter
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index bc287e1e7cdcf9..bdb83790653661 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1428,7 +1428,7 @@ Special read-only attributes
 
        .. deprecated:: 3.12
           This attribute of code objects is deprecated, and may be removed in
-          Python 3.14.
+          Python 3.15.
 
    * - .. attribute:: codeobject.co_stacksize
      - The required stack size of the code object
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index c99c4559a79f91..e9b5499155dd1b 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -1338,8 +1338,8 @@ Deprecated
 
 * Accessing :attr:`~codeobject.co_lnotab` on code objects was deprecated in
   Python 3.10 via :pep:`626`,
-  but it only got a proper :exc:`DeprecationWarning` in 3.12,
-  therefore it will be removed in 3.14.
+  but it only got a proper :exc:`DeprecationWarning` in 3.12.
+  May be removed in 3.15.
   (Contributed by Nikita Sobolev in :gh:`101866`.)
 
 .. include:: ../deprecations/pending-removal-in-3.13.rst