Skip to content

bpo-37532: email.header.make_header with ascii out of range(128) #14696

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
aldwinaldwin wants to merge 2 commits into from
Closed

bpo-37532: email.header.make_header with ascii out of range(128) #14696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60dcf03
bpo-37532: email.header.make_header() doesn't work if any `ascii` cod…
aldwinaldwin Jul 11, 2019
37e2c0c
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 11, 2019
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
9 changes: 8 additions & 1 deletion Lib/email/header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,14 @@ def decode_header(header):
last_word = last_charset = None
for word, charset in decoded_words:
if isinstance(word, str):
word = bytes(word, 'raw-unicode-escape')
word_tmp = bytes(word, 'raw-unicode-escape')
input_charset = charset or 'us-ascii'
try:
# Test to avoid UnicodeDecodeError in Header.append()
_ = word_tmp.decode(input_charset, errors='strict')
word = word_tmp
except UnicodeDecodeError:
word, charset = word.encode('utf-8'), 'utf-8'
if last_word is None:
last_word = word
last_charset = charset
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,6 +2396,14 @@ def test_multiline_header(self):
self.assertEqual(str(make_header(decode_header(s))),
'"Müller T" <T.Mueller@xxx.com>')

def test_unicode_decode_error(self):
s = 'Hostel,=?UTF-8?B?UGFuYW3DoSBDaXR5?=, Panamá'
self.assertEqual(decode_header(s),
[(b'Hostel,', None),
(b'Panam\xc3\xa1 City, Panam\xc3\xa1', 'utf-8')])
self.assertEqual(str(make_header(decode_header(s))),
'Hostel, Panamá City, Panamá')


# Test the MIMEMessage class
class TestMIMEMessage(TestEmailBase):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-07-11-02-50-17.bpo-37532.efSn_v.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid UnicodeDecodeError in email.header.make_header(). Patch by Aldwin Pollefeyt.