address review

Author: skirpichev

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`.)

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::
 

Lib/test/test_struct.py

@@ -1000,21 +1000,21 @@ def test_c_complex_round_trip(self):
                 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 f in ['F', 'D', '>F', '>D', '<F', '<D']:
-            z = 1+1j
-            with self.subTest(format=f):
+            with self.subTest(format=fmt):
                 with warnings.catch_warnings():
                     warnings.simplefilter("error", DeprecationWarning)
-                    self.assertRaises(DeprecationWarning, struct.pack, f, z)
+                    self.assertRaises(DeprecationWarning, struct.pack, fmt, z)
                 with warnings.catch_warnings():
                     with self.assertWarns(DeprecationWarning):
-                        b = struct.pack(f, z)
+                        b = struct.pack(fmt, z)
 
                 with warnings.catch_warnings():
                     warnings.simplefilter("error", DeprecationWarning)
-                    self.assertRaises(DeprecationWarning, struct.unpack, f, b)
+                    self.assertRaises(DeprecationWarning, struct.unpack, fmt, b)
                 with self.assertWarns(DeprecationWarning):
-                    round_trip = struct.unpack(f, b)[0]
+                    round_trip = struct.unpack(fmt, b)[0]
                 self.assertComplexesAreIdentical(z, round_trip)
 
     @unittest.skipIf(