diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-06-18 17:02:42 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-06-18 17:02:42 (GMT) |
| commit | e76ff4081aeabf2da9b04c70f031e34e53933110 (patch) | |
| tree | c5dca5bc8589411507a01161af40e557e18b5869 /Lib/email | |
| parent | 7df08379c65b623df96a534fdacd7302c6a24476 (diff) | |
| parent | e5e366c856b677d568b4ee35194ed9b8c7d4bbb4 (diff) | |
| download | cpython-e76ff4081aeabf2da9b04c70f031e34e53933110.zip cpython-e76ff4081aeabf2da9b04c70f031e34e53933110.tar.gz cpython-e76ff4081aeabf2da9b04c70f031e34e53933110.tar.bz2 | |
merge #11584: make Header and make_header handle binary unknown-8bit input
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/header.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/email/header.py b/Lib/email/header.py index 0670885..2e687b7 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -275,7 +275,10 @@ class Header: 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' |