Merge branch 'py3' into py3qt

This commit is contained in:
Kashiko Koibumi 2024-05-30 02:25:20 +09:00
commit 67004f39b5
No known key found for this signature in database
GPG Key ID: 8F06E069E37C40C4
2 changed files with 3 additions and 3 deletions

View File

@ -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")

View File

@ -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")