mirror of
https://github.com/python/cpython
synced 2024-09-16 00:17:02 +00:00
#11584: make Header and make_header handle binary unknown-8bit input
Analogous to the decode_header fix, this fix makes Header.append and make_header correctly handle the unknown-8bit charset introduced by email5.1, when the input to them is binary strings. Previous to this fix the make_header(decode_header(x)) == x invariant was broken in the face of the unknown-8bit charset.
This commit is contained in:
parent
6bdb1769dc
commit
e5e366c856
|
@ -275,7 +275,10 @@ def append(self, s, charset=None, errors='strict'):
|
|||
charset = Charset(charset)
|
||||
if not isinstance(s, str):
|
||||
input_charset = charset.input_codec or 'us-ascii'
|
||||
s = s.decode(input_charset, errors)
|
||||
if input_charset == _charset.UNKNOWN8BIT:
|
||||
s = s.decode('us-ascii', 'surrogateescape')
|
||||
else:
|
||||
s = s.decode(input_charset, errors)
|
||||
# Ensure that the bytes we're storing can be decoded to the output
|
||||
# character set, otherwise an early error is thrown.
|
||||
output_charset = charset.output_codec or 'us-ascii'
|
||||
|
|
|
@ -4182,6 +4182,21 @@ def test_escaped_8bit_header(self):
|
|||
'Ynwp4dUEbay Auction Semiar- No Charge \uFFFD Earn Big')
|
||||
self.assertEqual(email.header.decode_header(h), [(x, 'unknown-8bit')])
|
||||
|
||||
def test_header_handles_binary_unknown8bit(self):
|
||||
x = b'Ynwp4dUEbay Auction Semiar- No Charge \x96 Earn Big'
|
||||
h = Header(x, charset=email.charset.UNKNOWN8BIT)
|
||||
self.assertEqual(str(h),
|
||||
'Ynwp4dUEbay Auction Semiar- No Charge \uFFFD Earn Big')
|
||||
self.assertEqual(email.header.decode_header(h), [(x, 'unknown-8bit')])
|
||||
|
||||
def test_make_header_handles_binary_unknown8bit(self):
|
||||
x = b'Ynwp4dUEbay Auction Semiar- No Charge \x96 Earn Big'
|
||||
h = Header(x, charset=email.charset.UNKNOWN8BIT)
|
||||
h2 = email.header.make_header(email.header.decode_header(h))
|
||||
self.assertEqual(str(h2),
|
||||
'Ynwp4dUEbay Auction Semiar- No Charge \uFFFD Earn Big')
|
||||
self.assertEqual(email.header.decode_header(h2), [(x, 'unknown-8bit')])
|
||||
|
||||
def test_modify_returned_list_does_not_change_header(self):
|
||||
h = Header('test')
|
||||
chunks = email.header.decode_header(h)
|
||||
|
|
|
@ -26,7 +26,8 @@ Library
|
|||
-------
|
||||
|
||||
- Issue #11584: email.header.decode_header no longer fails if the header
|
||||
passed to it is a Header object.
|
||||
passed to it is a Header object, and Header/make_header no longer fail
|
||||
if given binary unknown-8bit input.
|
||||
|
||||
- Issue #11700: mailbox proxy object close methods can now be called multiple
|
||||
times without error.
|
||||
|
|
Loading…
Reference in a new issue