From 2e2ee4205f37d7c588d758d27a62334c195b9f6d Mon Sep 17 00:00:00 2001 From: azad-DH <69144439+azad-DH@users.noreply.github.com> Date: Fri, 11 Sep 2020 19:54:24 +0200 Subject: [PATCH 1/2] Minor change to init.py replace message_from_string with message_from_bytes --- src/ImapLibrary/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ImapLibrary/__init__.py b/src/ImapLibrary/__init__.py index 5dc9417..e99a845 100644 --- a/src/ImapLibrary/__init__.py +++ b/src/ImapLibrary/__init__.py @@ -19,7 +19,7 @@ IMAP Library - a IMAP email testing library. """ -from email import message_from_string +from email import message_from_bytes from imaplib import IMAP4, IMAP4_SSL from re import findall from time import sleep, time @@ -342,7 +342,7 @@ def walk_multipart_email(self, email_index): """ if not self._is_walking_multipart(email_index): data = self._imap.uid('fetch', email_index, '(RFC822)')[1][0][1] - msg = message_from_string(data) + msg = message_from_bytes(data) self._start_multipart_walk(email_index, msg) try: self._part = next(self._mp_iter) From cfbbde0a6901cd8d9d0394950533e0f005150ebf Mon Sep 17 00:00:00 2001 From: azad-DH <69144439+azad-DH@users.noreply.github.com> Date: Fri, 11 Sep 2020 20:02:03 +0200 Subject: [PATCH 2/2] Added fix for open_link_from_email As suggested by GitHub user lynhbn --- src/ImapLibrary/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImapLibrary/__init__.py b/src/ImapLibrary/__init__.py index e99a845..400440c 100644 --- a/src/ImapLibrary/__init__.py +++ b/src/ImapLibrary/__init__.py @@ -248,7 +248,7 @@ def open_link_from_email(self, email_index, link_index=0): if len(urls) > link_index: resp = urlopen(urls[link_index]) - content_type = resp.headers.getheader('content-type') + content_type = resp.headers.get('content-type') if content_type: enc = content_type.split('charset=')[-1] return ustr(resp.read(), enc)