diff options
| -rw-r--r-- | Lib/email/header.py | 5 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Lib/email/header.py b/Lib/email/header.py index 0a66df5..0670885 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -73,9 +73,10 @@ def decode_header(header): An email.errors.HeaderParseError may be raised when certain decoding error occurs (e.g. a base64 decoding exception). """ - # If it is a Header object, we can just return the chunks. + # If it is a Header object, we can just return the encoded chunks. if hasattr(header, '_chunks'): - return list(header._chunks) + return [(_charset._encode(string, str(charset)), str(charset)) + for string, charset in header._chunks] # If no encoding, just return the header with no charset. if not ecre.search(header): return [(header, None)] diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 281a65a..97a1e86 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -4176,8 +4176,8 @@ A very long line that must get split to something other than at the def test_escaped_8bit_header(self): x = b'Ynwp4dUEbay Auction Semiar- No Charge \x96 Earn Big' - x = x.decode('ascii', 'surrogateescape') - h = Header(x, charset=email.charset.UNKNOWN8BIT) + e = x.decode('ascii', 'surrogateescape') + h = Header(e, 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')]) @@ -25,6 +25,9 @@ Core and Builtins Library ------- +- Issue #11584: email.header.decode_header no longer fails if the header + passed to it is a Header object. + - Issue #11700: mailbox proxy object close methods can now be called multiple times without error. |