summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-01-27 11:18:04 -0400
committerKali Kaneko <kali@leap.se>2015-02-11 14:05:44 -0400
commita4305a4a57afb9a84fb56b6031947a3d2a717973 (patch)
tree59b6164f1be99f274038dd9e160abb6cc718090f
parent3e4c33021250df02cc50868016b0a73d2f069a40 (diff)
return empty string if we couldn't find body
so the server doesn't choke.
-rw-r--r--src/leap/mail/mail.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/mail/mail.py b/src/leap/mail/mail.py
index 2766524..4306ec3 100644
--- a/src/leap/mail/mail.py
+++ b/src/leap/mail/mail.py
@@ -22,7 +22,6 @@ import logging
import StringIO
from twisted.internet import defer
-from twisted.python import log
from leap.common.check import leap_assert_type
from leap.common.mail import get_email_charset
@@ -31,7 +30,6 @@ from leap.mail.adaptors.soledad import SoledadMailAdaptor
from leap.mail.constants import INBOX_NAME
from leap.mail.constants import MessageFlags
from leap.mail.mailbox_indexer import MailboxIndexer
-from leap.mail.utils import empty # find_charset
logger = logging.getLogger(name=__name__)
@@ -211,9 +209,8 @@ class Message(object):
Get a file descriptor with the body content.
"""
def write_and_rewind_if_found(cdoc):
- if not cdoc:
- return None
- return _write_and_rewind(cdoc.raw)
+ payload = cdoc.raw if cdoc else ""
+ return _write_and_rewind(payload)
d = defer.maybeDeferred(self._wrapper.get_body, store)
d.addCallback(write_and_rewind_if_found)