From 22b22b046986403b082e37fd53ff419014f781a6 Mon Sep 17 00:00:00 2001 From: rbas Date: Thu, 23 Oct 2014 14:22:12 +0200 Subject: [PATCH 1/2] Bug fix. Use IMAP4 transport when not use ssl --- imbox/imap.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imbox/imap.py b/imbox/imap.py index 627b8b5..ec05a10 100644 --- a/imbox/imap.py +++ b/imbox/imap.py @@ -11,10 +11,10 @@ class ImapTransport(object): self.transport = IMAP4_SSL if not self.port: self.port = 993 - else: - self.transport = IMAP4 - if not self.port: - self.port = 143 + else: + self.transport = IMAP4 + if not self.port: + self.port = 143 self.server = self.transport(self.hostname, self.port) From eef6cc99a65370da28ac970a545b4fc594bcf855 Mon Sep 17 00:00:00 2001 From: rbas Date: Thu, 23 Oct 2014 14:57:07 +0200 Subject: [PATCH 2/2] Bug fix. Set body when maintype is text --- imbox/parser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imbox/parser.py b/imbox/parser.py index 639af29..99ff752 100644 --- a/imbox/parser.py +++ b/imbox/parser.py @@ -131,9 +131,9 @@ def parse_email(raw_email): if attachment: attachments.append(attachment) - elif maintype == 'text': - payload = email_message.get_payload(decode=True) - body['plain'].append(payload) + elif maintype == 'text': + payload = email_message.get_payload(decode=True) + body['plain'].append(payload) parsed_email['attachments'] = attachments