diff options
| author | Jefferson Stachelski <jstachel@thoughtworks.com> | 2015-11-18 15:04:19 -0200 |
|---|---|---|
| committer | Jefferson Stachelski <jstachel@thoughtworks.com> | 2015-11-18 15:07:08 -0200 |
| commit | 8888ad02c22f90f5888e74bde19cc67553b0b395 (patch) | |
| tree | 695f25decd1aced2994492ddcb4bbbd1cac4934a | |
| parent | 591b6e9e3eb2df6c1814438358b29f5eff9d83e1 (diff) | |
Issue #511 - Don't deleting if mail is None
| -rw-r--r-- | service/pixelated/adapter/services/mail_service.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index bbaad2c5..7e6f1c63 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -123,10 +123,11 @@ class MailService(object): @defer.inlineCallbacks def delete_mail(self, mail_id): mail = yield self.mail(mail_id) - if mail.mailbox_name.upper() == u'TRASH': - yield self.mail_store.delete_mail(mail_id) - else: - yield self.mail_store.move_mail_to_mailbox(mail_id, 'TRASH') + if mail is not None: + if mail.mailbox_name.upper() == u'TRASH': + yield self.mail_store.delete_mail(mail_id) + else: + yield self.mail_store.move_mail_to_mailbox(mail_id, 'TRASH') @defer.inlineCallbacks def recover_mail(self, mail_id): |