mirror of
https://github.com/python/cpython.git
synced 2025-07-21 18:25:22 +00:00
56a9d7e3da
The fix is to charset.py, which was not doing the encoding to the correct output character set when doing a body_encode for either the shift-jis or euc-jp charsets. There's also a fix for handling a bytes input in encoders.py. Patch by Michael Henry, comment changes by me.
78 lines
2.1 KiB
Python
78 lines
2.1 KiB
Python
# Copyright (C) 2001-2006 Python Software Foundation
|
||
# Author: Barry Warsaw
|
||
# Contact: email-sig@python.org
|
||
|
||
"""Encodings and related functions."""
|
||
|
||
__all__ = [
|
||
'encode_7or8bit',
|
||
'encode_base64',
|
||
'encode_noop',
|
||
'encode_quopri',
|
||
]
|
||
|
||
|
||
from base64 import b64encode as _bencode
|
||
from quopri import encodestring as _encodestring
|
||
|
||
|
||
|
||
def _qencode(s):
|
||
enc = _encodestring(s, quotetabs=True)
|
||
# Must encode spaces, which quopri.encodestring() doesn't do
|
||
return enc.replace(' ', '=20')
|
||
|
||
|
||
def encode_base64(msg):
|
||
"""Encode the message's payload in Base64.
|
||
|
||
Also, add an appropriate Content-Transfer-Encoding header.
|
||
"""
|
||
orig = msg.get_payload()
|
||
encdata = str(_bencode(orig), 'ascii')
|
||
msg.set_payload(encdata)
|
||
msg['Content-Transfer-Encoding'] = 'base64'
|
||
|
||
|
||
|
||
def encode_quopri(msg):
|
||
"""Encode the message's payload in quoted-printable.
|
||
|
||
Also, add an appropriate Content-Transfer-Encoding header.
|
||
"""
|
||
orig = msg.get_payload()
|
||
encdata = _qencode(orig)
|
||
msg.set_payload(encdata)
|
||
msg['Content-Transfer-Encoding'] = 'quoted-printable'
|
||
|
||
|
||
|
||
def encode_7or8bit(msg):
|
||
"""Set the Content-Transfer-Encoding header to 7bit or 8bit."""
|
||
orig = msg.get_payload()
|
||
if orig is None:
|
||
# There's no payload. For backwards compatibility we use 7bit
|
||
msg['Content-Transfer-Encoding'] = '7bit'
|
||
return
|
||
# We play a trick to make this go fast. If encoding/decode to ASCII
|
||
# succeeds, we know the data must be 7bit, otherwise treat it as 8bit.
|
||
try:
|
||
if isinstance(orig, str):
|
||
orig.encode('ascii')
|
||
else:
|
||
orig.decode('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'
|
||
else:
|
||
msg['Content-Transfer-Encoding'] = '7bit'
|
||
|
||
|
||
|
||
def encode_noop(msg):
|
||
"""Do nothing."""
|