Merge branch 'main' into Reusable-Ubuntu-(Installed)

StanFromIreland · web-flow · commit 86e64ee0c8e1 · 2026-06-30T13:25:51.000+02:00
diff --git a/Doc/deprecations/pending-removal-in-3.21.rst b/Doc/deprecations/pending-removal-in-3.21.rst
@@ -17,3 +17,9 @@ Pending removal in Python 3.21
     are not generated by the parser or accepted by the code generator.
   * The ``dims`` property of ``ast.Tuple`` will be removed in Python 3.21. Use
     the ``ast.Tuple.elts`` property instead.
+
+* :mod:`struct`:
+
+  * Soft-deprecated since Python 3.15, using ``'F'`` and ``'D'`` type codes are now
+    deprecated.  These codes will be removed in Python 3.21.  Use instead
+    two-letter forms ``'Zf'`` and ``'Zd'``.
diff --git a/Doc/deprecations/soft-deprecations.rst b/Doc/deprecations/soft-deprecations.rst
@@ -19,8 +19,3 @@ There are no plans to remove :term:`soft deprecated` APIs.
 
   (Contributed by Gregory P. Smith in :gh:`86519` and
   Hugo van Kemenade in :gh:`148100`.)
-
-* Using ``'F'`` and ``'D'`` format type codes of the :mod:`struct` module
-  now are :term:`soft deprecated` in favor of two-letter forms ``'Zf'``
-  and ``'Zd'``.
-  (Contributed by Sergey B Kirpichev in :gh:`121249`.)
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
@@ -283,7 +283,9 @@ platform-dependent.
 
 .. versionchanged:: 3.15
    Added support for the ``'Zf'`` and ``'Zd'`` formats.
-   ``'F'`` and ``'D'`` formats are :term:`soft deprecated`.
+
+.. versionchanged:: 3.16
+   ``'F'`` and ``'D'`` formats are deprecated.
 
 .. seealso::
 
diff --git a/Doc/whatsnew/3.16.rst b/Doc/whatsnew/3.16.rst
@@ -550,6 +550,13 @@ New deprecations
     3.9, now issues a deprecation warning on use. This property is slated for
     removal in 3.21. Use ``ast.Tuple.elts`` instead.
 
+* :mod:`struct`:
+
+  * Soft-deprecated since Python 3.15, using ``'F'`` and ``'D'`` type codes are now
+    deprecated.  These codes will be removed in Python 3.21.  Use instead
+    two-letter forms ``'Zf'`` and ``'Zd'``.
+    (Contributed by Sergey B Kirpichev in :gh:`121249`.)
+
 .. Add deprecations above alphabetically, not here at the end.
 
 .. include:: ../deprecations/pending-removal-in-3.17.rst
diff --git a/Lib/test/test_ctypes/test_byteswap.py b/Lib/test/test_ctypes/test_byteswap.py
@@ -178,14 +178,14 @@ def test_endian_float_complex(self):
             self.assertIs(c_float_complex.__ctype_le__.__ctype_be__,
                           c_float_complex)
         s = c_float_complex(math.pi+1j)
-        self.assertEqual(bin(struct.pack("F", math.pi+1j)), bin(s))
+        self.assertEqual(bin(struct.pack("Zf", math.pi+1j)), bin(s))
         self.assertAlmostEqual(s.value, math.pi+1j, places=6)
         s = c_float_complex.__ctype_le__(math.pi+1j)
         self.assertAlmostEqual(s.value, math.pi+1j, places=6)
-        self.assertEqual(bin(struct.pack("<F", math.pi+1j)), bin(s))
+        self.assertEqual(bin(struct.pack("<Zf", math.pi+1j)), bin(s))
         s = c_float_complex.__ctype_be__(math.pi+1j)
         self.assertAlmostEqual(s.value, math.pi+1j, places=6)
-        self.assertEqual(bin(struct.pack(">F", math.pi+1j)), bin(s))
+        self.assertEqual(bin(struct.pack(">Zf", math.pi+1j)), bin(s))
 
     @unittest.skipUnless(hasattr(ctypes, 'c_double_complex'), "No complex types")
     def test_endian_double_complex(self):
@@ -199,14 +199,14 @@ def test_endian_double_complex(self):
             self.assertIs(c_double_complex.__ctype_le__.__ctype_be__,
                           c_double_complex)
         s = c_double_complex(math.pi+1j)
-        self.assertEqual(bin(struct.pack("D", math.pi+1j)), bin(s))
+        self.assertEqual(bin(struct.pack("Zd", math.pi+1j)), bin(s))
         self.assertAlmostEqual(s.value, math.pi+1j, places=6)
         s = c_double_complex.__ctype_le__(math.pi+1j)
         self.assertAlmostEqual(s.value, math.pi+1j, places=6)
-        self.assertEqual(bin(struct.pack("<D", math.pi+1j)), bin(s))
+        self.assertEqual(bin(struct.pack("<Zd", math.pi+1j)), bin(s))
         s = c_double_complex.__ctype_be__(math.pi+1j)
         self.assertAlmostEqual(s.value, math.pi+1j, places=6)
-        self.assertEqual(bin(struct.pack(">D", math.pi+1j)), bin(s))
+        self.assertEqual(bin(struct.pack(">Zd", math.pi+1j)), bin(s))
 
     def test_endian_other(self):
         self.assertIs(c_byte.__ctype_le__, c_byte)
diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py
@@ -717,8 +717,8 @@ def test_half_float(self):
         self.assertListEqual(half_view.tolist(), float_view.tolist())
 
     def test_complex_types(self):
-        float_complex_data = struct.pack('FFF', 0.0, -1.5j, 1+2j)
-        double_complex_data = struct.pack('DDD', 0.0, -1.5j, 1+2j)
+        float_complex_data = struct.pack('ZfZfZf', 0.0, -1.5j, 1+2j)
+        double_complex_data = struct.pack('ZdZdZd', 0.0, -1.5j, 1+2j)
         float_complex_view = memoryview(float_complex_data).cast('Zf')
         double_complex_view = memoryview(double_complex_data).cast('Zd')
         self.assertEqual(float_complex_view.nbytes * 2, double_complex_view.nbytes)
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
@@ -7,6 +7,7 @@
 import unittest
 import struct
 import sys
+import warnings
 import weakref
 
 from test import support
@@ -995,14 +996,26 @@ def test_c_complex_round_trip(self):
         values = [complex(*_) for _ in combinations([1, -1, 0.0, -0.0, 2,
                                                      -3, INF, -INF, NAN], 2)]
         for z in values:
-            for f in [
-                'F', 'D', 'Zf', 'Zd',
-                '>F', '>D', '>Zf', '>Zd',
-                '<F', '<D', '<Zf', '<Zd',
-            ]:
+            for f in ['Zf', 'Zd', '>Zf', '>Zd', '<Zf', '<Zd']:
                 with self.subTest(z=z, format=f):
                     round_trip = struct.unpack(f, struct.pack(f, z))[0]
                     self.assertComplexesAreIdentical(z, round_trip)
+        z = 1+1j
+        for fmt in ['F', 'D', '>F', '>D', '<F', '<D']:
+            with self.subTest(format=fmt):
+                with warnings.catch_warnings():
+                    warnings.simplefilter("error", DeprecationWarning)
+                    self.assertRaises(DeprecationWarning, struct.pack, fmt, z)
+                with warnings.catch_warnings():
+                    with self.assertWarns(DeprecationWarning):
+                        b = struct.pack(fmt, z)
+
+                with warnings.catch_warnings():
+                    warnings.simplefilter("error", DeprecationWarning)
+                    self.assertRaises(DeprecationWarning, struct.unpack, fmt, b)
+                with self.assertWarns(DeprecationWarning):
+                    round_trip = struct.unpack(fmt, b)[0]
+                self.assertComplexesAreIdentical(z, round_trip)
 
     @unittest.skipIf(
         support.is_android or support.is_apple_mobile,
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -2282,8 +2282,8 @@ def test_remote_exec_deleted_libpython(self):
     def test_remote_exec_deleted_static_executable(self):
         """Test remote exec when the target static executable was deleted."""
         build_dir = sysconfig.get_config_var('abs_builddir')
-        srcdir = sysconfig.get_config_var('srcdir')
-        if not build_dir or not srcdir:
+        stdlib_dir = os.path.dirname(os.path.abspath(os.__file__))
+        if not build_dir or not os.path.isdir(stdlib_dir):
             self.skipTest('cannot determine build-tree locations')
 
         pybuilddir_txt = os.path.join(build_dir, 'pybuilddir.txt')
@@ -2300,8 +2300,7 @@ def test_remote_exec_deleted_static_executable(self):
             copied_build_dir = os.path.join(copied_root, 'build')
             copied_pybuilddir = os.path.join(copied_build_dir, pybuilddir)
             os.makedirs(os.path.dirname(copied_pybuilddir))
-            os.symlink(os.path.join(srcdir, 'Lib'),
-                       os.path.join(copied_root, 'Lib'))
+            os.symlink(stdlib_dir, os.path.join(copied_root, 'Lib'))
             os.symlink(source_ext_dir, copied_pybuilddir)
             shutil.copy2(pybuilddir_txt,
                          os.path.join(copied_build_dir, 'pybuilddir.txt'))
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst
@@ -0,0 +1,2 @@
+Fix a crash caused when running out of memory creating a
+:mod:`!_interpchannels` channel. Now a :exc:`MemoryError` is correctly raised.
diff --git a/Misc/NEWS.d/next/Library/2026-06-26-19-01-13.gh-issue-121249.p1SBW0.rst b/Misc/NEWS.d/next/Library/2026-06-26-19-01-13.gh-issue-121249.p1SBW0.rst
@@ -0,0 +1 @@
+Deprecate using ``'F'`` and ``'D'`` type codes in the :mod:`struct` module.
diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c
@@ -354,7 +354,7 @@ clear_module_state(module_state *state)
 #define ERR_CHANNEL_INTERP_CLOSED -4
 #define ERR_CHANNEL_EMPTY -5
 #define ERR_CHANNEL_NOT_EMPTY -6
-#define ERR_CHANNEL_MUTEX_INIT -7
+#define ERR_CHANNEL_MUTEX_INIT -7  // currently unused
 #define ERR_CHANNELS_MUTEX_INIT -8
 #define ERR_NO_NEXT_CHANNEL_ID -9
 #define ERR_CHANNEL_CLOSED_WAITING -10
@@ -427,10 +427,6 @@ handle_channel_error(int err, PyObject *mod, int64_t cid)
                      "if not empty (try force=True)",
                      cid);
     }
-    else if (err == ERR_CHANNEL_MUTEX_INIT) {
-        PyErr_SetString(state->ChannelError,
-                        "can't initialize mutex for new channel");
-    }
     else if (err == ERR_CHANNELS_MUTEX_INIT) {
         PyErr_SetString(state->ChannelError,
                         "can't initialize mutex for channel management");
@@ -1744,7 +1740,8 @@ channel_create(_channels *channels, struct _channeldefaults defaults)
 {
     PyThread_type_lock mutex = PyThread_allocate_lock();
     if (mutex == NULL) {
-        return ERR_CHANNEL_MUTEX_INIT;
+        PyErr_NoMemory();
+        return -1;
     }
     _channel_state *chan = _channel_new(mutex, defaults);
     if (chan == NULL) {
@@ -2938,7 +2935,7 @@ channelsmod_create(PyObject *self, PyObject *args, PyObject *kwds)
 
     int64_t cid = channel_create(&_globals.channels, defaults);
     if (cid < 0) {
-        (void)handle_channel_error(-1, self, cid);
+        (void)handle_channel_error(cid, self, cid);
         return NULL;
     }
     module_state *state = get_module_state(self);
diff --git a/Modules/_struct.c b/Modules/_struct.c
@@ -1697,6 +1697,21 @@ prepare_s(PyStructObject *self, PyObject *format)
         if (e == NULL)
             return -1;
 
+        if (strcmp(e->format, "F") == 0) {
+            if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                            "The 'F' type code is deprecated, use 'Zf'", 1))
+            {
+                return -1;
+            }
+        }
+        if (strcmp(e->format, "D") == 0) {
+            if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                            "The 'D' type code is deprecated, use 'Zd'", 1))
+            {
+                return -1;
+            }
+        }
+
         switch (c) {
             case 's': _Py_FALLTHROUGH;
             case 'p':
@@ -2065,6 +2080,20 @@ s_unpack_internal(PyStructObject *soself, const char *startfrom,
                 }
                 v = PyBytes_FromStringAndSize(res + 1, n);
             } else {
+                if (strcmp(e->format, "F") == 0) {
+                    if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                            "The 'F' type code is deprecated, use 'Zf'", 1))
+                    {
+                        goto fail;
+                    }
+                }
+                if (strcmp(e->format, "D") == 0) {
+                    if (PyErr_WarnEx(PyExc_DeprecationWarning,
+                            "The 'D' type code is deprecated, use 'Zd'", 1))
+                    {
+                        goto fail;
+                    }
+                }
                 v = e->unpack(state, res, e);
             }
             if (v == NULL)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a crash caused when running out of memory creating a`
	`2`	+:mod:`!_interpchannels` channel. Now a :exc:`MemoryError` is correctly raised.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Deprecate using ``'F'`` and ``'D'`` type codes in the :mod:`struct` module.