Don't lost opening bracket in get_domain_literal

+ fix tests and news entry

Author: sergey-miryanov

Lib/email/_header_value_parser.py

@@ -1594,9 +1594,9 @@ def get_domain_literal(value):
         raise errors.HeaderParseError("expected '[' at start of domain-literal "
                 "but found '{}'".format(value))
     value = value[1:]
+    domain_literal.append(ValueTerminal('[', 'domain-literal-start'))
     if _check_for_early_dl_end(value, domain_literal):
         return domain_literal, value
-    domain_literal.append(ValueTerminal('[', 'domain-literal-start'))
     if value[0] in WSP:
         token, value = get_fws(value)
         domain_literal.append(token)

Lib/test/test_email/test__header_value_parser.py

@@ -2492,23 +2492,35 @@ def test_get_address_quoted_strings_in_atom_list(self):
         self.assertEqual(address.all_mailboxes[0].addr_spec, '"example example"@example.com')
 
     def test_get_address_with_invalid_domain(self):
-        address = parser.get_address("<T@[")
-        self.assertEqual(len(address), 2)
-        self.assertEqual(address[0].token_type, 'address')
-        self.assertEqual(address[0].all_mailboxes[0].local_part, 'T')
-        self.assertEqual(address[0].all_mailboxes[0].domain, ']')
-        self.assertEqual(address[0].all_mailboxes[0].addr_spec, 'T@]')
-        self.assertEqual(str(address[0].all_defects[0]), "missing trailing '>' on angle-addr")
-        self.assertEqual(str(address[0].all_defects[1]), "end of input inside domain-literal")
-
-        address = parser.get_address("!an??:=m==fr2@[C")
-        self.assertEqual(len(address), 2)
-        self.assertEqual(address[0].token_type, 'address')
-        self.assertEqual(address[0].all_mailboxes[0].local_part, '=m==fr2')
-        self.assertEqual(address[0].all_mailboxes[0].domain, '[C]')
-        self.assertEqual(address[0].all_mailboxes[0].addr_spec, '=m==fr2@[C]')
-        self.assertEqual(str(address[0].all_defects[0]), "end of header in group")
-        self.assertEqual(str(address[0].all_defects[1]), "end of input inside domain-literal")
+        address = self._test_get_x(parser.get_address,
+            '<T@[',
+            '<T@[]>',
+            '<T@[]>',
+            [errors.InvalidHeaderDefect,    # missing trailing '>' on angle-addr
+             errors.InvalidHeaderDefect,    # end of input inside domain-literal
+            ],
+            '')
+        self.assertEqual(address.token_type, 'address')
+        self.assertEqual(len(address.mailboxes), 0)
+        self.assertEqual(len(address.all_mailboxes), 1)
+        self.assertEqual(address.all_mailboxes[0].domain, '[]')
+        self.assertEqual(address.all_mailboxes[0].local_part, 'T')
+        self.assertEqual(address[0].token_type, 'invalid-mailbox')
+
+        address = self._test_get_x(parser.get_address,
+            '!an??:=m==fr2@[C',
+            '!an??:=m==fr2@[C];',
+            '!an??:=m==fr2@[C];',
+            [errors.InvalidHeaderDefect,    # end of header in group
+             errors.InvalidHeaderDefect,    # end of input inside domain-literal
+            ],
+            '')
+        self.assertEqual(address.token_type, 'address')
+        self.assertEqual(len(address.mailboxes), 0)
+        self.assertEqual(len(address.all_mailboxes), 1)
+        self.assertEqual(address.all_mailboxes[0].domain, '[C]')
+        self.assertEqual(address.all_mailboxes[0].local_part, '=m==fr2')
+        self.assertEqual(address[0].token_type, 'group')
 
     # get_address_list
 
@@ -2784,7 +2796,14 @@ def test_parse_valid_message_id(self):
         self.assertEqual(message_id.token_type, 'message-id')
 
     def test_parse_message_id_with_invalid_domain(self):
-        message_id = parser.parse_message_id("<T@[")
+        message_id = self._test_parse_x(
+            parser.parse_message_id,
+            "<T@[",
+            "<T@[]>",
+            "<T@[]>",
+            [errors.ObsoleteHeaderDefect] + [errors.InvalidHeaderDefect] * 2,
+            [],
+            )
         self.assertEqual(message_id.token_type, 'message-id')
         self.assertEqual(str(message_id.all_defects[-1]),
                          "end of input inside domain-literal")

Misc/NEWS.d/next/Library/2025-05-18-23-46-21.gh-issue-134152.30HwbX.rst

@@ -1 +1 @@
-:mod:`email`: Fix parsing of emails message ID with invalid domain.
+:mod:`email`: Fix parsing of email message ID with invalid domain.