diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-02-05 15:29:49 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-02-05 15:29:49 -0300 |
| commit | 621fd3a9099f980fa4d0a2402713e1778913d489 (patch) | |
| tree | 6bac7814c6999180dfaa313d683a554e9e65906d /src/leap/mail/imap/mailbox.py | |
| parent | 74428b3176d286312f69e124d4d613c27a1ec93e (diff) | |
| parent | 3f9c3ab22523c553dc677d5273dc8d01394d74f7 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/feature/regression-tests' into develop
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): |