diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-04-12 14:48:58 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-04-12 14:48:58 (GMT) |
| commit | ef3d6bd25f7bb235c80e1a2c128903661c56ddcf (patch) | |
| tree | b2ff1393e66576e4b2b9e58f684caa9014866e05 | |
| parent | 46cd93a42f917bcd0a1cc7ca62eec55e56331d6f (diff) | |
| download | cpython-ef3d6bd25f7bb235c80e1a2c128903661c56ddcf.zip cpython-ef3d6bd25f7bb235c80e1a2c128903661c56ddcf.tar.gz cpython-ef3d6bd25f7bb235c80e1a2c128903661c56ddcf.tar.bz2 | |
Merged revisions 79994 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79994 | r.david.murray | 2010-04-12 10:26:06 -0400 (Mon, 12 Apr 2010) | 9 lines
Issue #7472: ISO-2022 charsets now consistently use 7bit CTE.
Fixed a typo in the email.encoders module so that messages output using
an ISO-2022 character set will use a content-transfer-encoding of
7bit consistently. Previously if the input data had any eight bit
characters the output data would get marked as 8bit even though it
was actually 7bit.
........
| -rw-r--r-- | Lib/email/encoders.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py index 2e77e61..20feb02 100644 --- a/Lib/email/encoders.py +++ b/Lib/email/encoders.py @@ -62,7 +62,7 @@ def encode_7or8bit(msg): # iso-2022-* is non-ASCII but still 7-bit charset = msg.get_charset() output_cset = charset and charset.output_charset - if output_cset and output_cset.lower().startswith('iso-2202-'): + if output_cset and output_cset.lower().startswith('iso-2022-'): msg['Content-Transfer-Encoding'] = '7bit' else: msg['Content-Transfer-Encoding'] = '8bit' @@ -312,6 +312,10 @@ C-API Library ------- +- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022 + character sets will now consistently use a Content-Transfer-Encoding of + 7bit rather than sometimes being marked as 8bit. + - Issue #8375: test_distutils now checks if the temporary directory are still present before it cleans them. |