mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

#11584: Since __getitem__ returns headers, make decode_header handle them.

Browse source 
Why I consider this a bug rather than an API change: the API change was
to Message, which didn't used to return Headers unless you added them
yourself.  Now it does (for 8bit binary header input), so decode_header
needs to be able to handle them.
This commit is contained in:
R David Murray 2011-03-25 15:10:55 -04:00
parent 213eb96902
commit 041015cc70
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/email/header.py
View file

@ -66,9 +66,15 @@ def decode_header(header):
otherwise a lower-case string containing the name of the character set otherwise a lower-case string containing the name of the character set
specified in the encoded string. specified in the encoded string.
header may be a string that may or may not contain RFC2047 encoded words,
or it may be a Header object.
An email.errors.HeaderParseError may be raised when certain decoding error An email.errors.HeaderParseError may be raised when certain decoding error
occurs (e.g. a base64 decoding exception). occurs (e.g. a base64 decoding exception).
""" """
# If it is a Header object, we can just return the chunks.
if hasattr(header, '_chunks'):
return list(header._chunks)
# If no encoding, just return the header with no charset. # If no encoding, just return the header with no charset.
if not ecre.search(header): if not ecre.search(header):
return [(header, None)] return [(header, None)]

14
Lib/email/test/test_email.py
View file

@ -3918,6 +3918,20 @@ A very long line that must get split to something other than at the
h.append(x, errors='replace') h.append(x, errors='replace')
eq(str(h), e) eq(str(h), e)
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)
self.assertEqual(str(h),
'Ynwp4dUEbay Auction Semiar- No Charge \uFFFD Earn Big')
self.assertEqual(email.header.decode_header(h), [(x, 'unknown-8bit')])
def test_modify_returned_list_does_not_change_header(self):
h = Header('test')
chunks = email.header.decode_header(h)
chunks.append(('ascii', 'test2'))
self.assertEqual(str(h), 'test')
def test_encoded_adjacent_nonencoded(self): def test_encoded_adjacent_nonencoded(self):
eq = self.assertEqual eq = self.assertEqual
h = Header() h = Header()