diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/encoders.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 8 |
2 files changed, 6 insertions, 4 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' diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 44a47c5..79146a3 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -970,7 +970,8 @@ class TestMIMEAudio(unittest.TestCase): def test_encoding(self): payload = self._au.get_payload() - self.assertEqual(base64.decodebytes(payload), self._audiodata) + self.assertEqual(base64.decodebytes(bytes(payload, 'ascii')), + self._audiodata) def test_checkSetMinor(self): au = MIMEAudio(self._audiodata, 'fish') @@ -1010,7 +1011,8 @@ class TestMIMEImage(unittest.TestCase): def test_encoding(self): payload = self._im.get_payload() - self.assertEqual(base64.decodebytes(payload), self._imgdata) + self.assertEqual(base64.decodebytes(bytes(payload, 'ascii')), + self._imgdata) def test_checkSetMinor(self): im = MIMEImage(self._imgdata, 'fish') @@ -1050,7 +1052,7 @@ class TestMIMEApplication(unittest.TestCase): eq = self.assertEqual bytes = b'\xfa\xfb\xfc\xfd\xfe\xff' msg = MIMEApplication(bytes) - eq(msg.get_payload(), b'+vv8/f7/') + eq(msg.get_payload(), '+vv8/f7/') eq(msg.get_payload(decode=True), bytes) |