Adjust warning message and stacklevel

python · gpshead · Jan 23, 2023 · Feb 5, 2022 · Feb 5, 2022 · Feb 7, 2022
commit 22a1618dddb0b29da22d7d3920da2a727bf24b85
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
@@ -3963,7 +3963,8 @@ class BoolTest(unittest.TestCase):
     def test_warning(self):
         e = ET.fromstring('<a style="new"></a>')
         msg = (
-            r"The behavior of this method will change in future versions.  "
+            r"Testing an element's truth value will raise an exception in "
+            r"future versions.  "
             r"Use specific 'len\(elem\)' or 'elem is not None' test instead.")
         with self.assertWarnsRegex(DeprecationWarning, msg):
             result = bool(e)

diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
@@ -200,7 +200,8 @@ def __len__(self):
 
     def __bool__(self):
         warnings.warn(
-            "The behavior of this method will change in future versions.  "
+            "Testing an element's truth value will raise an exception in "
+            "future versions.  "
             "Use specific 'len(elem)' or 'elem is not None' test instead.",
             DeprecationWarning, stacklevel=2
             )

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
@@ -1454,10 +1454,10 @@ element_bool(PyObject* self_)
 {
     ElementObject* self = (ElementObject*) self_;
     if (PyErr_WarnEx(PyExc_DeprecationWarning,
-                     "DeprecationWarning: The behavior of this method will "
-                     "change in future versions.  Use specific 'len(elem)' or "
+                     "Testing an element's truth value will raise an exception "
+                     "in future versions.  Use specific 'len(elem)' or "
                      "'elem is not None' test instead.",
-                     2) < 0) {
+                     1) < 0) {
         return -1;
     };
     if (self->extra ? self->extra->length : 0) {