From 8ab0f708c5ee7856511823a6a1aab14cb99307cb Mon Sep 17 00:00:00 2001 From: ashvetsov Date: Thu, 11 Apr 2013 15:48:49 +0400 Subject: [PATCH 1/2] Fixed issue with exception when IMAP transport returned no messages. --HG-- branch : ashvetsov/fixes-to-push extra : source : b9b283ff46d734933c4a715630e114d5e250a34b --- django_mailbox/transports/imap.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/django_mailbox/transports/imap.py b/django_mailbox/transports/imap.py index 1c57b1c..9872129 100644 --- a/django_mailbox/transports/imap.py +++ b/django_mailbox/transports/imap.py @@ -21,6 +21,10 @@ class ImapTransport(object): def get_message(self): typ, inbox = self.server.search(None, 'ALL') + + if not inbox[0]: + return + for key in inbox[0].split(): try: typ, msg_contents = self.server.fetch(key, '(RFC822)') From 60718f5ea88e86e61706a8c1deecc37c0f21ae0b Mon Sep 17 00:00:00 2001 From: ashvetsov Date: Thu, 11 Apr 2013 15:56:22 +0400 Subject: [PATCH 2/2] Fixed issue that made it possible for signal receiver to break `getmail`. --HG-- branch : ashvetsov/fixes-to-push extra : source : a76f8a4e1cf9c469710eb30d093be749965ee213 --- django_mailbox/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 8c83b04..b32bd87 100755 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -165,7 +165,12 @@ class Mailbox(models.Model): msg = self._process_message(message) msg.outgoing = False msg.save() - message_received.send(sender=self, message=msg) + + try: + message_received.send(sender=self, message=msg) + except: + pass + return msg def record_outgoing_message(self, message):