Skip to content

gh-118716: Do not enforce ASCII to format address #118717

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

Closed
cedk wants to merge 2 commits into from
Closed

gh-118716: Do not enforce ASCII to format address #118717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bbb200
gh-118716: Do not fail on non ASCII local part when parsing addr_spec
cedk May 7, 2024
0f62095
📜🤖 Added by blurb_it.
blurb-it[bot] May 10, 2024
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
Next Next commit
gh-118716: Do not fail on non ASCII local part when parsing addr_spec 
RFC 6530 allows UTF-8 strings in the local part.
  • Loading branch information
@cedk
cedk committed May 10, 2024
commit 2bbb20074103ec23512a0cee75d9b3596d8d2b81
5 changes: 3 additions & 2 deletions Lib/email/headerregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ def __init__(self, display_name='', username='', domain='', addr_spec=None):
raise ValueError("Invalid addr_spec; only '{}' "
"could be parsed from '{}'".format(
a_s, addr_spec))
if a_s.all_defects:
raise a_s.all_defects[0]
for defect in a_s.all_defects:
if not isinstance(defect, errors.NonASCIILocalPartDefect):
raise defect
username = a_s.local_part
domain = a_s.domain
self._display_name = display_name
Expand Down
23 changes: 11 additions & 12 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 @@ -1492,17 +1492,20 @@ def test_quoting(self):
self.assertEqual(str(a), '"Sara J." <"bad name"@example.com>')

def test_il8n(self):
a = Address('Éric', 'wok', 'exàmple.com')
a = Address('Éric', 'wők', 'exàmple.com')
self.assertEqual(a.display_name, 'Éric')
self.assertEqual(a.username, 'wok')
self.assertEqual(a.username, 'wők')
self.assertEqual(a.domain, 'exàmple.com')
self.assertEqual(a.addr_spec, 'wok@exàmple.com')
self.assertEqual(str(a), 'Éric <wok@exàmple.com>')
self.assertEqual(a.addr_spec, 'wők@exàmple.com')
self.assertEqual(str(a), 'Éric <wők@exàmple.com>')

# XXX: there is an API design issue that needs to be solved here.
#def test_non_ascii_username_raises(self):
# with self.assertRaises(ValueError):
# Address('foo', 'wők', 'example.com')
def test_non_ascii_username_in_addr_spec(self):
a = Address('foo', addr_spec='wők@example.com')
self.assertEqual(a.display_name, 'foo')
self.assertEqual(a.username, 'wők')
self.assertEqual(a.domain, 'example.com')
self.assertEqual(a.addr_spec, 'wők@example.com')
self.assertEqual(str(a), 'foo <wők@example.com>')

def test_crlf_in_constructor_args_raises(self):
cases = (
Expand All @@ -1523,10 +1526,6 @@ def test_crlf_in_constructor_args_raises(self):
with self.subTest(kwargs=kwargs), self.assertRaisesRegex(ValueError, "invalid arguments"):
Address(**kwargs)

def test_non_ascii_username_in_addr_spec_raises(self):
with self.assertRaises(ValueError):
Address('foo', addr_spec='wők@example.com')

def test_address_addr_spec_and_username_raises(self):
with self.assertRaises(TypeError):
Address('foo', username='bing', addr_spec='bar@baz')
Expand Down