Deprecate for recommended five years

hugovk · hugovk · commit bfbe4b7f4673 · 2025-09-17T10:45:47.000+01:00
diff --git a/Doc/deprecations/index.rst b/Doc/deprecations/index.rst
@@ -7,8 +7,12 @@ Deprecations
 
 .. include:: pending-removal-in-3.17.rst
 
+.. include:: pending-removal-in-3.18.rst
+
 .. include:: pending-removal-in-3.19.rst
 
+.. include:: pending-removal-in-3.20.rst
+
 .. include:: pending-removal-in-future.rst
 
 C API deprecations
diff --git a/Doc/deprecations/pending-removal-in-3.17.rst b/Doc/deprecations/pending-removal-in-3.17.rst
@@ -21,24 +21,3 @@ Pending removal in Python 3.17
     :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`.)
-
-* The ``__version__`` attribute has been deprecated in these standard library
-  modules and will be removed in Python 3.17.
-  Use :py:data:`sys.version_info` instead.
-
-  - :mod:`argparse`
-  - :mod:`csv`
-  - :mod:`!ctypes.macholib`
-  - :mod:`ipaddress`
-  - :mod:`json`
-  - :mod:`logging` (``__date__`` also deprecated)
-  - :mod:`optparse`
-  - :mod:`pickle`
-  - :mod:`platform`
-  - :mod:`re`
-  - :mod:`socketserver`
-  - :mod:`tabnanny`
-  - :mod:`tkinter.font`
-  - :mod:`tkinter.ttk`
-
-  (Contributed by Hugo van Kemenade in :gh:`76007`.)
diff --git a/Doc/deprecations/pending-removal-in-3.20.rst b/Doc/deprecations/pending-removal-in-3.20.rst
@@ -0,0 +1,23 @@
+Pending removal in Python 3.20
+------------------------------
+
+* The ``__version__`` attribute has been deprecated in these standard library
+  modules and will be removed in Python 3.20.
+  Use :py:data:`sys.version_info` instead.
+
+  - :mod:`argparse`
+  - :mod:`csv`
+  - :mod:`!ctypes.macholib`
+  - :mod:`ipaddress`
+  - :mod:`json`
+  - :mod:`logging` (``__date__`` also deprecated)
+  - :mod:`optparse`
+  - :mod:`pickle`
+  - :mod:`platform`
+  - :mod:`re`
+  - :mod:`socketserver`
+  - :mod:`tabnanny`
+  - :mod:`tkinter.font`
+  - :mod:`tkinter.ttk`
+
+  (Contributed by Hugo van Kemenade in :gh:`76007`.)
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -1349,6 +1349,12 @@ Deprecated
 
 .. include:: ../deprecations/pending-removal-in-3.17.rst
 
+.. include:: ../deprecations/pending-removal-in-3.18.rst
+
+.. include:: ../deprecations/pending-removal-in-3.19.rst
+
+.. include:: ../deprecations/pending-removal-in-3.20.rst
+
 .. include:: ../deprecations/pending-removal-in-future.rst
 
 .. _whatsnew312-removed:
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -2026,6 +2026,12 @@ New Deprecations
 
 .. include:: ../deprecations/pending-removal-in-3.17.rst
 
+.. include:: ../deprecations/pending-removal-in-3.18.rst
+
+.. include:: ../deprecations/pending-removal-in-3.19.rst
+
+.. include:: ../deprecations/pending-removal-in-3.20.rst
+
 .. include:: ../deprecations/pending-removal-in-future.rst
 
 CPython Bytecode Changes
diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
@@ -2794,6 +2794,8 @@ Deprecated
 
 .. include:: ../deprecations/pending-removal-in-3.19.rst
 
+.. include:: ../deprecations/pending-removal-in-3.20.rst
+
 .. include:: ../deprecations/pending-removal-in-future.rst
 
 
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
@@ -573,7 +573,7 @@ __version__
 -----------
 
 * The ``__version__`` attribute has been deprecated in these standard library
-  modules and will be removed in Python 3.17.
+  modules and will be removed in Python 3.20.
   Use :py:data:`sys.version_info` instead.
 
   - :mod:`argparse`
@@ -601,6 +601,8 @@ __version__
 
 .. include:: ../deprecations/pending-removal-in-3.19.rst
 
+.. include:: ../deprecations/pending-removal-in-3.20.rst
+
 .. include:: ../deprecations/pending-removal-in-future.rst
 
 Removed
diff --git a/Lib/argparse.py b/Lib/argparse.py
@@ -2778,6 +2778,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "1.1"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/csv.py b/Lib/csv.py
@@ -515,6 +515,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "1.0"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
@@ -2422,6 +2422,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "1.0"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
@@ -362,6 +362,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "2.0.9"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
@@ -2344,7 +2344,7 @@ def __getattr__(name):
     if name in ("__version__", "__date__"):
         from warnings import _deprecated
 
-        _deprecated(name, remove=(3, 17))
+        _deprecated(name, remove=(3, 20))
         return {  # Do not change
             "__version__": "0.5.1.2",
             "__date__": "07 February 2010",
diff --git a/Lib/optparse.py b/Lib/optparse.py
@@ -1673,6 +1673,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "1.5.3"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -1438,7 +1438,7 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "1.1.0"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
diff --git a/Lib/re/__init__.py b/Lib/re/__init__.py
@@ -430,6 +430,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "2.2.1"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
@@ -864,6 +864,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "0.4"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py
@@ -336,7 +336,7 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "6"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
diff --git a/Lib/tkinter/font.py b/Lib/tkinter/font.py
@@ -201,7 +201,7 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "0.9"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
@@ -1652,6 +1652,6 @@ def __getattr__(name):
     if name == "__version__":
         from warnings import _deprecated
 
-        _deprecated("__version__", remove=(3, 17))
+        _deprecated("__version__", remove=(3, 20))
         return "0.3.1"  # Do not change
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
