diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-06-18 16:30:55 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-06-18 16:30:55 (GMT) |
| commit | 6bdb1769dcd1a95a7f6fa7d98d05e835be931466 (patch) | |
| tree | d34efed0702eb2381bb2e0ca54b98a3a34a40c60 /Lib/email/header.py | |
| parent | c88bce1580c61ee33bf72e55b817940dba46d99c (diff) | |
| download | cpython-6bdb1769dcd1a95a7f6fa7d98d05e835be931466.zip cpython-6bdb1769dcd1a95a7f6fa7d98d05e835be931466.tar.gz cpython-6bdb1769dcd1a95a7f6fa7d98d05e835be931466.tar.bz2 | |
#11584: make decode_header handle Header objects correctly
This updates b21fdfa0019c, which fixed this bug incorrectly.
Diffstat (limited to 'Lib/email/header.py')
| -rw-r--r-- | Lib/email/header.py | 5 |
1 files changed, 3 insertions, 2 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)] |