Card #30 - fixes bug in which % character on multipart body was causing an exception

2 files changed, 13 insertions, 4 deletions

diff --git a/service/pixelated/adapter/mail.py b/service/pixelated/adapter/mail.py
index f152c73f..82b4d0a6 100644
--- a/service/pixelated/adapter/mail.py
+++ b/service/pixelated/adapter/mail.py
@@ -197,14 +197,14 @@ class PixelatedMail(Mail):
         if self.parts and len(self.parts['alternatives']) > 1:
             body = ''
             for alternative in self.parts['alternatives']:
-                body += "--%(boundary)s\n"
+                body += '--' + self.boundary + '\n'
                 for header, value in alternative['headers'].items():
-                    body += "%s: %s\n" % (header, value)
+                    body += '%s: %s\n' % (header, value)
                 body += '\n'
                 body += alternative['content']
                 body += '\n'
-            body += '--%(boundary)s--'
-            return body % {'boundary': self.boundary}
+            body += '--' + self.boundary + '--'
+            return body
         else:
             return self.bdoc.content['raw']
 
diff --git a/service/test/unit/adapter/mail_test.py b/service/test/unit/adapter/mail_test.py
index 35fe411e..8b35b181 100644
--- a/service/test/unit/adapter/mail_test.py
+++ b/service/test/unit/adapter/mail_test.py
@@ -102,6 +102,15 @@ class TestPixelatedMail(unittest.TestCase):
         self.assertRegexpMatches(mail.body, '\nContent-Type: text/plain\n\nblablabla\n')
         self.assertRegexpMatches(mail.body, '.*--' + mail.boundary + '--$')
 
+    def test_percent_character_is_allowed_on_body(self):
+        parts = {'alternatives': [], 'attachments': []}
+        parts['alternatives'].append({'content': '100% happy with percentage symbol', 'headers': {'Content-Type': 'text/plain'}})
+        parts['alternatives'].append({'content': '<p>100% happy with percentage symbol</p>', 'headers': {'Content-Type': 'text/html'}})
+
+        mail = PixelatedMail.from_soledad(None, None, None, None, parts=parts)
+
+        self.assertRegexpMatches(mail.body, '([\s\S]*100%){2}')
+
 
 class InputMailTest(unittest.TestCase):
     mail_dict = lambda x: {