Skip to content

Commit 8f3f6fd

Browse files
committed
Remove incomplete fix and temporarily disable new tests.
1 parent 3df70b6 commit 8f3f6fd

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

Lib/email/_header_value_parser.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2885,17 +2885,6 @@ def _refold_parse_tree(parse_tree, *, policy):
28852885
last_word_is_ew = False
28862886
continue
28872887

2888-
if want_encoding and part.token_type == 'addr-spec':
2889-
# RFC2047 forbids encoded-word in any part of an addr-spec.
2890-
if charset == 'unknown-8bit':
2891-
# Non-ASCII addr-spec came from parsed message; leave unchanged.
2892-
want_encoding = False
2893-
else:
2894-
raise errors.InvalidMailboxError(
2895-
f"Non-ASCII mailbox '{part}' is invalid"
2896-
" under current policy setting (utf8=False)"
2897-
)
2898-
28992888
if want_encoding and not wrap_as_ew_blocked:
29002889
if not part.as_ew_allowed:
29012890
want_encoding = False

Lib/test/test_email/test_generator.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ def test_keep_long_encoded_newlines(self):
296296
g.flatten(msg)
297297
self.assertEqual(s.getvalue(), self.typ(expected))
298298

299-
def test_non_ascii_addr_spec_raises(self):
299+
# XXX renable after fix.
300+
def xest_non_ascii_addr_spec_raises(self):
300301
# RFC2047 encoded-word is not permitted in any part of an addr-spec.
301302
# (See also test_non_ascii_addr_spec_preserved below.)
302303
g = self.genclass(self.ioclass(), policy=self.policy.clone(utf8=False))
@@ -579,7 +580,8 @@ def test_smtp_policy(self):
579580
g.flatten(msg)
580581
self.assertEqual(s.getvalue(), expected)
581582

582-
def test_non_ascii_addr_spec_preserved(self):
583+
# XXX renable after fix.
584+
def xest_non_ascii_addr_spec_preserved(self):
583585
# A defective non-ASCII addr-spec parsed from the original
584586
# message is left unchanged when flattening.
585587
# (See also test_non_ascii_addr_spec_raises above.)

0 commit comments

Comments
 (0)