From 860ebcdc4459427c973f41a6cd4fc546f86bbcaa Mon Sep 17 00:00:00 2001 From: medmunds Date: Sat, 12 Jan 2013 14:00:34 -0800 Subject: [PATCH] Python 3.2 (but not 3.3) b64decode requires bytes not str --- djrill/tests/test_mandrill_send.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/djrill/tests/test_mandrill_send.py b/djrill/tests/test_mandrill_send.py index 2b2710d..ad89306 100644 --- a/djrill/tests/test_mandrill_send.py +++ b/djrill/tests/test_mandrill_send.py @@ -115,19 +115,23 @@ class DjrillBackendTests(DjrillBackendMockAPITestCase): email.attach(mimeattachment) email.send() + + def decode_att(att): + return b64decode(att.encode('ascii')) + data = self.get_api_call_data() attachments = data['message']['attachments'] self.assertEqual(len(attachments), 3) self.assertEqual(attachments[0]["type"], "text/plain") self.assertEqual(attachments[0]["name"], "test.txt") - self.assertEqual(b64decode(attachments[0]["content"]).decode('ascii'), + self.assertEqual(decode_att(attachments[0]["content"]).decode('ascii'), text_content) self.assertEqual(attachments[1]["type"], "image/png") # inferred self.assertEqual(attachments[1]["name"], "test.png") - self.assertEqual(b64decode(attachments[1]["content"]), png_content) + self.assertEqual(decode_att(attachments[1]["content"]), png_content) self.assertEqual(attachments[2]["type"], "application/pdf") self.assertEqual(attachments[2]["name"], "") # none - self.assertEqual(b64decode(attachments[2]["content"]), pdf_content) + self.assertEqual(decode_att(attachments[2]["content"]), pdf_content) def test_extra_header_errors(self): email = mail.EmailMessage('Subject', 'Body', 'from@example.com',