summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-04-12 14:48:58 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-04-12 14:48:58 (GMT)
commitef3d6bd25f7bb235c80e1a2c128903661c56ddcf (patch)
treeb2ff1393e66576e4b2b9e58f684caa9014866e05 /Lib/email
parent46cd93a42f917bcd0a1cc7ca62eec55e56331d6f (diff)
downloadcpython-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. ........
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/encoders.py2
1 files changed, 1 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'