FutureWarning -> DeprecationWarning

python · gpshead · Jan 23, 2023 · Feb 5, 2022 · Feb 5, 2022 · Feb 7, 2022
commit 4e0e1170e6675ed4d7713fe68a4899fd3a2d7001
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
@@ -3965,14 +3965,14 @@ def test_warning(self):
         msg = (
             r"The behavior of this method will change in future versions.  "
             r"Use specific 'len\(elem\)' or 'elem is not None' test instead.")
-        with self.assertWarnsRegex(FutureWarning, msg):
+        with self.assertWarnsRegex(DeprecationWarning, msg):
             result = bool(e)
         # Emulate prior behavior for now
         self.assertIs(result, False)
 
         # Element with children
         ET.SubElement(e, 'b')
-        with self.assertWarnsRegex(FutureWarning, msg):
+        with self.assertWarnsRegex(DeprecationWarning, msg):
             new_result = bool(e)
         self.assertIs(new_result, True)
 

diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
@@ -202,7 +202,7 @@ def __bool__(self):
         warnings.warn(
             "The behavior of this method will change in future versions.  "
             "Use specific 'len(elem)' or 'elem is not None' test instead.",
-            FutureWarning, stacklevel=2
+            DeprecationWarning, stacklevel=2
             )
         return len(self._children) != 0 # emulate old behaviour, for now
 

diff --git a/Misc/NEWS.d/next/Library/2022-02-05-12-01-58.bpo-38941.8IhvyG.rst b/Misc/NEWS.d/next/Library/2022-02-05-12-01-58.bpo-38941.8IhvyG.rst
@@ -1,3 +1,4 @@
-The C implementation of the :mod:`xml.etree.ElementTree` module now emits
-:exc:`FutureWarning` when testing the truth value of an
-:class:`xml.etree.ElementTree.Element`, just like the Python implementation.
+The :mod:`xml.etree.ElementTree` module now emits :exc:`DeprecationWarning`
+when testing the truth value of an :class:`xml.etree.ElementTree.Element`.
+Before, the Python implementation emitted `FutureWarning`, and the C
+implementation emitted nothing.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
@@ -1426,8 +1426,8 @@ static int
 element_bool(PyObject* self_)
 {
     ElementObject* self = (ElementObject*) self_;
-    (void)PyErr_WarnEx(PyExc_FutureWarning,
-        "FutureWarning: The behavior of this method will change in future versions.  "
+    (void)PyErr_WarnEx(PyExc_DeprecationWarning,
+        "DeprecationWarning: The behavior of this method will change in future versions.  "
         "Use specific 'len(elem)' or 'elem is not None' test instead.",
         2);
     if (self->extra ? self->extra->length : 0) {