mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#14360: make encoders.encode_quopri work.

Browse source 
There were no tests for the encoders module.  encode_base64 worked
because it is the default and so got tested implicitly elsewhere, and
we use encode_7or8bit internally, so that worked, too.  I previously
fixed encode_noop, so this fix means that everythign in the encoders
module now works, hopefully correctly.  Also added an explicit test
for encode_base64.
This commit is contained in:
R David Murray 2013-06-27 18:37:00 -04:00
parent c7f7579855
commit f6069f9f22
2 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/email/encoders.py
View file

@ -20,7 +20,7 @@ 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')
return enc.replace(b' ', b'=20')
def encode_base64(msg):
@ -41,8 +41,12 @@ def encode_quopri(msg):
Also, add an appropriate Content-Transfer-Encoding header.
"""
orig = msg.get_payload()
if isinstance(orig, str):
# If it is a string, the model data may have binary data encoded in via
# surrogateescape. Convert back to bytes so we can CTE encode it.
orig = orig.encode('ascii', 'surrogateescape')
encdata = _qencode(orig)
msg.set_payload(encdata)
msg.set_payload(encdata.decode('ascii', 'surrogateescape'))
msg['Content-Transfer-Encoding'] = 'quoted-printable'