summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-05 16:47:36 -0400
committerKali Kaneko <kali@leap.se>2014-02-05 16:47:36 -0400
commit88451ef514e6bea56e6d0bd415f85412336c41fd (patch)
tree92a239ae83df0b9406011e90581211f56a223379
parent08da9c1fa8a6f232d2a29489b5eeeaf1f21b63cd (diff)
Fix the fallback for the memoized call for bodies/content.
Changed to "empty" to consider empty strings too.
-rw-r--r--mail/src/leap/mail/imap/memorystore.py9
-rw-r--r--mail/src/leap/mail/imap/messageparts.py2
2 files changed, 6 insertions, 5 deletions
diff --git a/mail/src/leap/mail/imap/memorystore.py b/mail/src/leap/mail/imap/memorystore.py
index f4a4522b..9c7973d4 100644
--- a/mail/src/leap/mail/imap/memorystore.py
+++ b/mail/src/leap/mail/imap/memorystore.py
@@ -230,10 +230,11 @@ class MemoryStore(object):
self._add_message(mbox, uid, message, notify_on_disk)
self._new.add(key)
- def log_add(result):
- log.msg("message save: %s" % result)
- return result
- observer.addCallback(log_add)
+ # XXX use this while debugging the callback firing,
+ # remove after unittesting this.
+ #def log_add(result):
+ #return result
+ #observer.addCallback(log_add)
if notify_on_disk:
# We store this deferred so we can keep track of the pending
diff --git a/mail/src/leap/mail/imap/messageparts.py b/mail/src/leap/mail/imap/messageparts.py
index 2d9b3a28..b1f333a5 100644
--- a/mail/src/leap/mail/imap/messageparts.py
+++ b/mail/src/leap/mail/imap/messageparts.py
@@ -398,7 +398,7 @@ class MessagePart(object):
payload = ""
else:
payload = self._get_payload_from_document_memoized(phash)
- if payload is None:
+ if empty(payload):
payload = self._get_payload_from_document(phash)
else: