Bump removal for Python 3.15

python · hugovk · Jun 11, 2023 · Aug 7, 2022 · Aug 14, 2022 · May 23, 2023
commit 2fb57bc5ad9744f62b7f0684d97143be3fb27a22
diff --git a/Doc/library/array.rst b/Doc/library/array.rst
@@ -55,7 +55,7 @@ Notes:
       ``Py_UNICODE``. This change doesn't affect its behavior because
       ``Py_UNICODE`` is alias of ``wchar_t`` since Python 3.3.
 
-   .. deprecated-removed:: 3.3 3.14
+   .. deprecated-removed:: 3.3 3.15
 
 
 The actual representation of values is determined by the machine architecture

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -854,9 +854,6 @@ APIs:
 
 * Creating :c:data:`immutable types <Py_TPFLAGS_IMMUTABLETYPE>` with mutable
   bases using the C API (:gh:`95388`)
-* :mod:`array`'s ``'u'`` format code, deprecated in docs since Python 3.3,
-  emits :exc:`DeprecationWarning` since 3.12
-  (contributed by Hugo van Kemenade in :gh:`80480`)
 
 * Deprecated :class:`collections.abc.ByteString`.
   Prefer :class:`Sequence` or :class:`collections.abc.Buffer`.

diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -97,7 +97,12 @@ Optimizations
 Deprecated
 ==========
 
+Pending Removal in Python 3.15
+------------------------------
 
+* :mod:`array`'s ``'u'`` format code, deprecated in docs since Python 3.3,
+  emits :exc:`DeprecationWarning` since 3.13
+  (contributed by Hugo van Kemenade in :gh:`80480`)
 
 Removed
 =======

diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
@@ -103,7 +103,7 @@ def setUp(self):
         warnings.filterwarnings(
             "ignore",
             message="The 'u' type code is deprecated and "
-                    "will be removed in Python 3.14",
+                    "will be removed in Python 3.15",
             category=DeprecationWarning)
 
     def test_error(self):

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -2617,7 +2617,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     if (c == 'u') {
         if (PyErr_WarnEx(PyExc_DeprecationWarning,
                          "The 'u' type code is deprecated and "
-                         "will be removed in Python 3.14",
+                         "will be removed in Python 3.15",
                          1)) {
             return NULL;
         }