Bitmessage/PyBitmessage-2024-12-11
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

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
pull from: kashikoibumi/py3qt
merge into: Bitmessage:v0.6
Conversation 2 Commits 127 Files Changed 179 +26
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d9d30e1e1 - Show all commits

26
src/bitmessageqt/__init__.py
View File

@ -19,6 +19,8 @@ import six
from six.moves import range as xrange
if six.PY3:
from codecs import escape_decode
if six.PY2:
import sqlite3
from unqstr import ustr, unic
from dbcompat import dbstr
@ -2927,6 +2929,14 @@ class MyForm(settingsmixin.SMainWindow):
return
queryreturn = sqlQuery(
'SELECT message FROM inbox WHERE msgid=?', msgid)
# for compatibility
if len(queryreturn) < 1:
if six.PY3:
queryreturn = sqlQuery(
'SELECT message FROM inbox WHERE msgid=CAST(? AS TEXT)', msgid)
else: # assume six.PY2
queryreturn = sqlQuery(
'SELECT message FROM inbox WHERE msgid=?', sqlite3.Binary(msgid))
try:
lines_raw = queryreturn[-1][0].split('\n')
lines = []
@ -4154,6 +4164,22 @@ class MyForm(settingsmixin.SMainWindow):
else ('inbox', 'msgid')
), msgid
)
# for compatibility
if len(queryreturn) < 1:
if six.PY3:
queryreturn = sqlQuery(
'SELECT message FROM %s WHERE %s=CAST(? AS TEXT)' % (
('sent', 'ackdata') if folder == 'sent'
else ('inbox', 'msgid')
), msgid
)
else: # assume six.PY2
queryreturn = sqlQuery(
'SELECT message FROM %s WHERE %s=?' % (
('sent', 'ackdata') if folder == 'sent'
else ('inbox', 'msgid')
), sqlite3.Binary(msgid)
)
try:
message = queryreturn[-1][0].decode("utf-8", "replace")