Skip to content

gh-101034: Clarify error for email domain ending with a dot #151972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonghuaroot wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −0
Open

gh-101034: Clarify error for email domain ending with a dot #151972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/email/_header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,6 +1668,11 @@ def get_domain(value):
domain[:] = domain[0]
while value and value[0] == '.':
domain.append(DOT)
# A trailing dot leaves get_atom an empty string, whose error
# ("expected atext but found ''") hides the real problem.
if len(value) == 1:
raise errors.HeaderParseError(
"expected atom after '.' but found end of domain")
token, value = get_atom(value[1:])
domain.append(token)
return domain, value
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_email/test__header_value_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,6 +1501,13 @@ def test_get_domain_no_atom_raises(self):
with self.assertRaises(errors.HeaderParseError):
parser.get_domain(" (foo)\t, broken")

def test_get_domain_obsolete_trailing_dot_raises(self):
# gh-101034: a trailing dot must not surface get_atom's internal
# "expected atext but found ''" error.
with self.assertRaisesRegex(errors.HeaderParseError,
"expected atom after '.'"):
parser.get_domain("example.org.")


# get_addr_spec

Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_email/test_headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,13 @@ def test_bad_addr_sepc_raises(self):
with self.assertRaises(ValueError):
Address('foo', addr_spec="name@ex[]ample.com")

def test_trailing_dot_in_addr_spec_domain_raises(self):
# gh-101034: report a clear error instead of the internal
# "expected atext but found ''".
with self.assertRaisesRegex(errors.HeaderParseError,
"expected atom after '.'"):
Address('Jane Doe', addr_spec="jane_doe@example.org.")

def test_empty_group(self):
g = Group('foo')
self.assertEqual(g.display_name, 'foo')
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2026-06-23-08-06-58.gh-issue-101034.VYZ3dP.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix the misleading ``HeaderParseError`` raised for an email address whose
domain ends with a dot (such as ``user@example.org.``) in
:mod:`email.headerregistry`. It now reports a clear error instead of the
internal ``expected atext but found ''``.
Loading