From 27ef93797c4e0bdb46c9c2873264f89840028a5e Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Mon, 12 Apr 2010 14:26:06 +0000 Subject: [PATCH] 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. --- Lib/email/encoders.py | 2 +- Misc/NEWS | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py index 06016cdea7c..c1a44aa88c8 100644 --- a/Lib/email/encoders.py +++ b/Lib/email/encoders.py @@ -75,7 +75,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' diff --git a/Misc/NEWS b/Misc/NEWS index ed6bccb7cfe..c95076eaed6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,10 @@ Core and Builtins 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 #8330: Fix expected output in test_gdb. - Issue #8374: Update the internal alias table in the :mod:`locale` module