Deprecate for recommended five years

Author: hugovk

Doc/deprecations/pending-removal-in-3.17.rst

@@ -1,23 +1,22 @@
 Pending removal in Python 3.17
 ------------------------------
 
-* :mod:`collections.abc`:
-
-  - :class:`collections.abc.ByteString` is scheduled for removal in Python 3.17. Prefer
-    :class:`~collections.abc.Sequence` or :class:`~collections.abc.Buffer`. For use in
-    type annotations, prefer a union, like ``bytes | bytearray``, or
-    :class:`collections.abc.Buffer`. (Contributed by Shantanu Jain in :gh:`91896`.)
-
 * :mod:`typing`:
 
   - Before Python 3.14, old-style unions were implemented using the private class
     ``typing._UnionGenericAlias``. This class is no longer needed for the implementation,
     but it has been retained for backward compatibility, with removal scheduled for Python
     3.17. Users should use documented introspection helpers like :func:`typing.get_origin`
     and :func:`typing.get_args` instead of relying on private implementation details.
-
   - :class:`typing.ByteString`, deprecated since Python 3.9, is scheduled for removal in
     Python 3.17. Prefer :class:`~collections.abc.Sequence` or
     :class:`~collections.abc.Buffer`. For use in type annotations, prefer a union, like
     ``bytes | bytearray``, or :class:`collections.abc.Buffer`.
     (Contributed by Shantanu Jain in :gh:`91896`.)
+
+* :mod:`collections.abc`:
+
+  - :class:`collections.abc.ByteString` is scheduled for removal in Python 3.17. Prefer
+    :class:`~collections.abc.Sequence` or :class:`~collections.abc.Buffer`. For use in
+    type annotations, prefer a union, like ``bytes | bytearray``, or
+    :class:`collections.abc.Buffer`. (Contributed by Shantanu Jain in :gh:`91896`.)

Lib/test/test_argparse.py

@@ -7360,7 +7360,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(argparse, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_csv.py

@@ -1608,7 +1608,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(csv, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_ctypes/test_macholib.py

@@ -114,7 +114,7 @@ def test_deprecated__version__(self):
 
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(ctypes.macholib, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_ipaddress.py

@@ -2825,7 +2825,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(ipaddress, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_json/__init__.py

@@ -51,7 +51,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(json, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_logging.py

@@ -7238,7 +7238,7 @@ def test__all__(self):
 
 class TestModule(unittest.TestCase):
     def test_deprecated__version__and__date__(self):
-        msg = "is deprecated and slated for removal in Python 3.17"
+        msg = "is deprecated and slated for removal in Python 3.20"
         for attr in ("__version__", "__date__"):
             with self.subTest(attr=attr):
                 with self.assertWarnsRegex(DeprecationWarning, msg) as cm:

Lib/test/test_optparse.py

@@ -1670,7 +1670,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(optparse, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_re.py

@@ -3120,7 +3120,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(re, "__version__")
         self.assertEqual(cm.filename, __file__)

Lib/test/test_socketserver.py

@@ -515,7 +515,7 @@ class TestModule(unittest.TestCase):
     def test_deprecated__version__(self):
         with self.assertWarnsRegex(
             DeprecationWarning,
-            "'__version__' is deprecated and slated for removal in Python 3.17",
+            "'__version__' is deprecated and slated for removal in Python 3.20",
         ) as cm:
             getattr(socketserver, "__version__")
         self.assertEqual(cm.filename, __file__)