diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-06-04 16:15:34 +0000 |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-06-04 16:15:34 +0000 |
| commit | 99147c40b5d67d875b5a383d2ed2f54c02da82de (patch) | |
| tree | 1f37b9f345c0401df49a587a84f77202ea82a459 /Lib/email/encoders.py | |
| parent | d3f1503f32453298db41c6803dba9d37e47e372d (diff) | |
| download | cpython-99147c40b5d67d875b5a383d2ed2f54c02da82de.tar.gz cpython-99147c40b5d67d875b5a383d2ed2f54c02da82de.zip | |
Merged revisions 81685 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r81685 | r.david.murray | 2010-06-04 12:11:08 -0400 (Fri, 04 Jun 2010) | 4 lines
#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.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py index 20feb026fdf..0ea441d9637 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' |