diff options
| author | Kali Kaneko <kali@leap.se> | 2014-02-05 11:48:20 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-02-05 14:01:35 -0400 |
| commit | 423624e5f2c4d3f8cfe8f15f4d6649ed3eea11dc (patch) | |
| tree | c1a052110d49018b3fa646ffab329403b5104766 /src/leap/mail/imap/mailbox.py | |
| parent | 3511f7992e67bc49e9fc4771f4b2c0d9199822d7 (diff) | |
fix expunge deferreds so they wait
Diffstat (limited to 'src/leap/mail/imap/mailbox.py')
| -rw-r--r-- | src/leap/mail/imap/mailbox.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py index c682578..d8af0a5 100644 --- a/src/leap/mail/imap/mailbox.py +++ b/src/leap/mail/imap/mailbox.py @@ -484,9 +484,6 @@ class SoledadMailbox(WithMsgFields, MBoxParser): d.addCallback(self._close_cb) return d - def _expunge_cb(self, result): - return result - def expunge(self): """ Remove all messages flagged \\Deleted @@ -494,9 +491,7 @@ class SoledadMailbox(WithMsgFields, MBoxParser): if not self.isWriteable(): raise imap4.ReadOnlyMailbox d = defer.Deferred() - return self._memstore.expunge(self.mbox, d) - self._memstore.expunge(self.mbox) - d.addCallback(self._expunge_cb, d) + self._memstore.expunge(self.mbox, d) return d def _bound_seq(self, messages_asked): |