#11584: make decode_header handle Header objects correctly
This updates b21fdfa0019c, which fixed this bug incorrectly.
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 @@
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)]