Deprecate version attribute in xml.sax.expatreader

Author: hugovk

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

@@ -1,9 +1,9 @@
 Pending removal in Python 3.20
 ------------------------------
 
-* The ``__version__`` and ``VERSION`` attributes have been deprecated in these
-  standard library modules and will be removed in Python 3.20.
-  Use :py:data:`sys.version_info` instead.
+* The ``__version__``, ``version`` and ``VERSION`` attributes have 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`
@@ -24,6 +24,7 @@ Pending removal in Python 3.20
   - :mod:`tkinter.font`
   - :mod:`tkinter.ttk`
   - :mod:`xml.etree.ElementTree`
+  - :mod:`xml.sax.expatreader`
   - :mod:`wsgiref.simple_server`
   - :mod:`zlib`
 

Doc/whatsnew/3.15.rst

@@ -1018,9 +1018,9 @@ New deprecations
 
 * ``__version__``
 
-  * The ``__version__`` and ``VERSION`` attributes have been deprecated in these
-    standard library modules and will be removed in Python 3.20.
-    Use :py:data:`sys.version_info` instead.
+  * The ``__version__``, ``version`` and ``VERSION`` attributes have 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`
@@ -1041,6 +1041,7 @@ New deprecations
     - :mod:`tkinter.font`
     - :mod:`tkinter.ttk`
     - :mod:`xml.etree.ElementTree`
+    - :mod:`xml.sax.expatreader`
     - :mod:`wsgiref.simple_server`
     - :mod:`zlib`
 

Lib/test/test_sax.py

@@ -1573,5 +1573,15 @@ def test_all(self):
         check__all__(self, sax, extra=extra)
 
 
+class TestModule(unittest.TestCase):
+    def test_deprecated_version(self):
+        with self.assertWarnsRegex(
+            DeprecationWarning,
+            "'version' is deprecated and slated for removal in Python 3.20",
+        ) as cm:
+                getattr(sax.expatreader, "version")
+        self.assertEqual(cm.filename, __file__)
+
+
 if __name__ == "__main__":
     unittest.main()

Lib/xml/sax/expatreader.py

@@ -3,8 +3,6 @@
 pyexpat.__version__ == '2.22'.
 """
 
-version = "0.20"
-
 from xml.sax._exceptions import *
 from xml.sax.handler import feature_validation, feature_namespaces
 from xml.sax.handler import feature_namespace_prefixes
@@ -446,9 +444,19 @@ def create_parser(*args, **kwargs):
 
 # ---
 
+def __getattr__(name):
+    if name == "version":
+        from warnings import _deprecated
+
+        _deprecated("version", remove=(3, 20))
+        return "0.20"  # Do not change
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+# ---
+
 if __name__ == "__main__":
     import xml.sax.saxutils
     p = create_parser()
     p.setContentHandler(xml.sax.saxutils.XMLGenerator())
     p.setErrorHandler(xml.sax.ErrorHandler())
-    p.parse("http://www.ibiblio.org/xml/examples/shakespeare/hamlet.xml")
+    p.parse("https://www.ibiblio.org/xml/examples/shakespeare/hamlet.xml")