Add HTTP status context to XML parsing error messages

Enhanced ResponseParserError messages to include HTTP status codes and
messages when XML parsing fails, providing better debugging context for
users while maintaining full backward compatibility.

Changes:
- Modified QueryParser._do_error_parse() to append HTTP status context
- Modified RestXMLParser._parse_error_from_body() to append HTTP status context
- Enhanced error messages format: "original error (HTTP 413: Content Too Large)"
- Preserves original ResponseParserError exception type for compatibility
- Added comprehensive tests for both parser classes
- Tests handle Python version differences in HTTP status messages

Author: adev-code

.python-version

@@ -0,0 +1,5 @@
+3.9.20
+3.10.15
+3.11.10
+3.12.7
+3.13.9

botocore/parsers.py

@@ -595,11 +595,13 @@ def _do_error_parse(self, response, shape):
         try:
             root = self._parse_xml_string_to_dom(xml_contents)
         except ResponseParserError as e:
-            status_message = http.client.responses.get(
-                response['status_code'], ''
-            )
-            if status_message and hasattr(e, 'add_note'):
-                e.add_note(f"HTTP {response['status_code']}: {status_message}")
+            status_code = response.get('status_code')
+            if status_code and status_code in http.client.responses:
+                status_message = http.client.responses[status_code]
+                error_msg_with_status = (
+                    f"{str(e)} (HTTP {status_code}: {status_message})"
+                )
+                raise ResponseParserError(error_msg_with_status)
             raise
         parsed = self._build_name_to_xml_node(root)
         self._replace_nodes(parsed)
@@ -1458,11 +1460,12 @@ def _parse_error_from_body(self, response):
         try:
             root = self._parse_xml_string_to_dom(xml_contents)
         except ResponseParserError as e:
-            status_message = http.client.responses.get(
-                response['status_code'], ''
-            )
-            if status_message and hasattr(e, 'add_note'):
-                e.add_note(f"HTTP {response['status_code']}: {status_message}")
+            status_code = response.get('status_code')
+            if status_code and status_code in http.client.responses:
+                status_message = http.client.responses[status_code]
+                raise ResponseParserError(
+                    f"{str(e)} (HTTP {status_code}: {status_message})"
+                )
             raise
         parsed = self._build_name_to_xml_node(root)
         self._replace_nodes(parsed)

tests/unit/test_parsers.py

@@ -1637,10 +1637,13 @@ def test_query_parser_empty_body_4xx_error_with_notes(self):
             parser._do_error_parse(response, None)
 
         exception = cm.exception
-
-        self.assertTrue(hasattr(exception, '__notes__'))
-        self.assertEqual(len(exception.__notes__), 1)
-        self.assertIn("HTTP 413:", exception.__notes__[0])
+        self.assertIn("HTTP 413:", str(exception))
+        error_msg = str(exception)
+        self.assertTrue(
+            "Request Entity Too Large" in error_msg
+            or "Content Too Large" in error_msg,
+            f"Expected HTTP 413 message not found in: {error_msg}",
+        )
 
     def test_parse_error_from_body_empty_body_4xx_error_with_notes(self):
         parser = parsers.RestXMLParser()
@@ -1658,10 +1661,13 @@ def test_parse_error_from_body_empty_body_4xx_error_with_notes(self):
             parser._parse_error_from_body(response)
 
         exception = cm.exception
-
-        self.assertTrue(hasattr(exception, '__notes__'))
-        self.assertEqual(len(exception.__notes__), 1)
-        self.assertIn("HTTP 413:", exception.__notes__[0])
+        self.assertIn("HTTP 413:", str(exception))
+        error_msg = str(exception)
+        self.assertTrue(
+            "Request Entity Too Large" in error_msg
+            or "Content Too Large" in error_msg,
+            f"Expected HTTP 413 message not found in: {error_msg}",
+        )
 
 
 def _generic_test_bodies():