diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py index 00342e1..4cb15ab 100644 --- a/offlineimap/accounts.py +++ b/offlineimap/accounts.py @@ -459,8 +459,9 @@ class SyncableAccount(Account): p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True) - r = p.communicate() - self.ui.callhook("Hook stdout: %s\nHook stderr:%s\n" % r) + stdout, stderr = p.communicate() + self.ui.callhook("Hook stdout: %s\nHook stderr:%s\n" + % (stdout.decode('utf-8'), stderr.decode('utf-8'))) self.ui.callhook("Hook return code: %d" % p.returncode) except (KeyboardInterrupt, SystemExit): raise diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py index 342c102..a23511e 100644 --- a/offlineimap/folder/IMAP.py +++ b/offlineimap/folder/IMAP.py @@ -482,7 +482,8 @@ class IMAPFolder(BaseFolder): item[1], flags=re.IGNORECASE): found = item[0] elif found is not None: - if type(item) == type(""): + if type(item) == type(b""): + item = item.decode('utf-8') uid = re.search("UID\s+(\d+)", item, flags=re.IGNORECASE) if uid: return int(uid.group(1))