summaryrefslogtreecommitdiffstats
path: root/Lib/email/encoders.py
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-06-04 16:11:08 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-06-04 16:11:08 (GMT)
commit7da8f06df09aff2f45df9ebcda40e9078a6ab92c (patch)
treebb566ef839c79b074df8381c4351d2b95ff26b9d /Lib/email/encoders.py
parentdeda8cb8352e7d240e51d6f261989b4fda767b60 (diff)
downloadcpython-7da8f06df09aff2f45df9ebcda40e9078a6ab92c.zip
cpython-7da8f06df09aff2f45df9ebcda40e9078a6ab92c.tar.gz
cpython-7da8f06df09aff2f45df9ebcda40e9078a6ab92c.tar.bz2
#4768: store base64 encoded email body parts as text, not binary.
Patch and tests by Forest Bond.
Diffstat (limited to 'Lib/email/encoders.py')
-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 20feb02..0ea441d 100644
--- a/Lib/email/encoders.py
+++ b/Lib/email/encoders.py
@@ -29,7 +29,7 @@ def encode_base64(msg):
Also, add an appropriate Content-Transfer-Encoding header.
"""
orig = msg.get_payload()
- encdata = _bencode(orig)
+ encdata = str(_bencode(orig), 'ascii')
msg.set_payload(encdata)
msg['Content-Transfer-Encoding'] = 'base64'