Merge branch 'py3' into py3qt
This commit is contained in:
commit
67004f39b5
|
@ -4179,7 +4179,7 @@ class MyForm(settingsmixin.SMainWindow):
|
||||||
('sent', 'ackdata') if folder == 'sent'
|
('sent', 'ackdata') if folder == 'sent'
|
||||||
else ('inbox', 'msgid')
|
else ('inbox', 'msgid')
|
||||||
), sqlite3.Binary(msgid)
|
), sqlite3.Binary(msgid)
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
message = queryreturn[-1][0].decode("utf-8", "replace")
|
message = queryreturn[-1][0].decode("utf-8", "replace")
|
||||||
|
|
|
@ -156,5 +156,5 @@ class MsgDecode(object):
|
||||||
if subject:
|
if subject:
|
||||||
subject = subject.splitlines()[0]
|
subject = subject.splitlines()[0]
|
||||||
# Field types should be the same for all message types
|
# Field types should be the same for all message types
|
||||||
self.subject = subject.decode('utf-8', 'replace')
|
self.subject = subject.decode("utf-8", "replace")
|
||||||
self.body = body.decode('utf-8', 'replace')
|
self.body = body.decode("utf-8", "replace")
|
||||||
|
|
Reference in New Issue
Block a user