mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Issue #7472: remove unused code from email.encoders.encode_7or8bit.
Yukihiro Nakadaira noticed a typo in encode_7or8bit that was trying to special case iso-2022 codecs. It turns out that the code in question is never used, because whereas it was designed to trigger if the payload encoding was eight bit but its output encoding was 7 bit, in practice the payload is always converted to the 7bit encoding before encode_7or8bit is called. Patch by Shawat Anand.
This commit is contained in:
parent
b26dc46576
commit
7d93221a5c
2 changed files with 8 additions and 7 deletions
|
@ -72,13 +72,7 @@ def encode_7or8bit(msg):
|
|||
try:
|
||||
orig.encode('ascii')
|
||||
except UnicodeError:
|
||||
# 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-2022-'):
|
||||
msg['Content-Transfer-Encoding'] = '7bit'
|
||||
else:
|
||||
msg['Content-Transfer-Encoding'] = '8bit'
|
||||
msg['Content-Transfer-Encoding'] = '8bit'
|
||||
else:
|
||||
msg['Content-Transfer-Encoding'] = '7bit'
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue