summaryrefslogtreecommitdiff
path: root/py-fake-service/app/adapter/mail.py
diff options
context:
space:
mode:
authorDuda Dornelles <ddornell@thoughtworks.com>2014-08-14 18:05:37 -0300
committerDuda Dornelles <ddornell@thoughtworks.com>2014-08-14 18:06:06 -0300
commitea88d617a0d6a942850922664590f80d32de7d87 (patch)
tree292c9616a2ab5c6f99215bc9b0c24c7b39bd5416 /py-fake-service/app/adapter/mail.py
parent2ee1f78a90fdb47844c8d200ede64169a56e5cbc (diff)
Revert "Enable fake server to correctly serve html emails"
This reverts commit dde0dc6bb735cebe946c6fd8c5d7c8cfd6028cc8.
Diffstat (limited to 'py-fake-service/app/adapter/mail.py')
-rw-r--r--py-fake-service/app/adapter/mail.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/py-fake-service/app/adapter/mail.py b/py-fake-service/app/adapter/mail.py
index 5e0483fc..1cbe065f 100644
--- a/py-fake-service/app/adapter/mail.py
+++ b/py-fake-service/app/adapter/mail.py
@@ -18,7 +18,7 @@ class Mail:
mail.draft_reply_for = mail_json.get('draft_reply_for', 0)
return mail
-
+
def __init__(self, mbox_mail=None, ident=None):
if mbox_mail:
self.header = self._get_headers(mbox_mail)
@@ -31,14 +31,11 @@ class Mail:
def _get_body(self, message):
if message.is_multipart():
- boundary = '--{boundary}'.format(boundary= message.get_boundary().strip())
- body_parts = [x.as_string() for x in message.get_payload()]
-
- body = boundary + '\n'
- body += '{boundary}\n'.format(boundary=boundary).join(body_parts)
- body += '{boundary}--\n'.format(boundary=boundary)
+ boundary = message.get_boundary()
+ start_boundary = '--'+boundary
+ join_boundary = start_boundary+'\n'
- return body
+ return join_boundary + join_boundary.join([x.as_string() for x in message.get_payload()]) + start_boundary+ '--'
else:
return message.get_payload()
@@ -63,7 +60,7 @@ class Mail:
def _get_tags(self, mbox_mail):
return mbox_mail.get('X-TW-Pixelated-Tags').split(', ')
-
+
@property
def subject(self):
return self.header['subject']