Runnable with both Python3 and Python2, with both PyQt5 and PyQt4 by using Qt.py #2250

Open
kashikoibumi wants to merge 127 commits from kashikoibumi/py3qt into v0.6
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 67004f39b5 - Show all commits

View File

@ -4179,7 +4179,7 @@ class MyForm(settingsmixin.SMainWindow):
('sent', 'ackdata') if folder == 'sent'
else ('inbox', 'msgid')
), sqlite3.Binary(msgid)
)
)
try:
message = queryreturn[-1][0].decode("utf-8", "replace")

View File

@ -156,5 +156,5 @@ class MsgDecode(object):
if subject:
subject = subject.splitlines()[0]
# Field types should be the same for all message types
self.subject = subject.decode('utf-8', 'replace')
self.body = body.decode('utf-8', 'replace')
self.subject = subject.decode("utf-8", "replace")
self.body = body.decode("utf-8", "replace")