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

buildscripts/winbuild.sh

@@ -72,6 +72,8 @@ function install_python(){
         wine python -m pip install pytools==2020.2
 	echo "Upgrading pip"
 	wine python -m pip install --upgrade pip
+	# install pypiwin32 for win32com
+	wine python -m pip install pypiwin32
 }
 
 function install_pyqt(){
@@ -82,6 +84,8 @@ function install_pyqt(){
 		echo "Installing PyQt-${PYQT_VERSION} 32b"
 		wine PyQt${PYQT_VERSION}-x32.exe /S /WX
 	fi
+	# and qtpy
+	wine python -m pip install qtpy
 }
 
 function install_openssl(){

docs/conf.py

@@ -216,8 +216,7 @@
     'pkg_resources',
     'pycanberra',
     'pyopencl',
-    'PyQt4',
-    'PyQt5',
+    'qtpy',
     'qrcode',
     'stem',
     'xdg',

packages/AppImage/PyBitmessage.yml

@@ -11,11 +11,13 @@ ingredients:
     - python-msgpack
     - python-qrcode
     - python-qt4
+    - python-qtpy
     - python-setuptools
     - python-sip
     - python-six
     - python-xdg
     - sni-qt
+    - xkb-data
   exclude:
     - libdb5.3
     - libglib2.0-0

packages/collectd/pybitmessagestatus.py

@@ -2,7 +2,7 @@
 
 import collectd
 import json
-import xmlrpclib
+from six.moves import xmlrpc_client as xmlrpclib
 
 pybmurl = ""
 api = ""

packages/pyinstaller/bitmessagemain.spec

@@ -43,8 +43,16 @@ a = Analysis(
         'setuptools.msvc', '_cffi_backend',
         'plugins.menu_qrcode', 'plugins.proxyconfig_stem'
     ],
-    runtime_hooks=[os.path.join(hookspath, 'pyinstaller_rthook_plugins.py')],
-    excludes=excludes
+    # https://github.com/pyinstaller/pyinstaller/wiki/Recipe-PyQt4-API-Version
+    runtime_hooks = [
+        os.path.join(hookspath, hook) for hook in (
+            'pyinstaller_rthook_pyqt4.py',
+            'pyinstaller_rthook_plugins.py'
+        )],
+    excludes += [
+        'PyQt4.QtOpenGL','PyQt4.QtSql',
+        'PyQt4.QtSvg', 'PyQt4.QtTest', 'PyQt4.QtWebKit', 'PyQt4.QtXml',
+        'win32ui']
 )
 
 
@@ -90,9 +98,8 @@ a.datas += addTranslations()
 a.datas += [('default.ini', os.path.join(srcPath, 'default.ini'), 'DATA')]
 
 excluded_binaries = [
-    'QtOpenGL4.dll',
-    'QtSvg4.dll',
-    'QtXml4.dll',
+    'QtOpenGL4.dll', 'QtSql4.dll', 'QtSvg4.dll', 'QtTest4.dll',
+    'QtWebKit4.dll', 'QtXml4.dll'
 ]
 a.binaries = TOC([x for x in a.binaries if x[0] not in excluded_binaries])
 

packages/pyinstaller/hooks/pyinstaller_rthook_pyqt4.py

@@ -0,0 +1,10 @@
+# https://github.com/pyinstaller/pyinstaller/wiki/Recipe-PyQt4-API-Version
+import sip
+
+sip.setapi(u'QDate', 2)
+sip.setapi(u'QDateTime', 2)
+sip.setapi(u'QString', 2)
+sip.setapi(u'QTextStream', 2)
+sip.setapi(u'QTime', 2)
+sip.setapi(u'QUrl', 2)
+sip.setapi(u'QVariant', 2)

py3start.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+python3 pybitmessage/bitmessagemain.py "$@"

revert_blob_to_text.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+python3 pybitmessage/revert_blob_to_text.py "$@"

setup.py

@@ -4,6 +4,7 @@
 import platform
 import shutil
 import sys
+import six
 
 from importlib import import_module
 from setuptools import setup, Extension
@@ -83,7 +84,7 @@ def run(self):
         'images/kivy/text_images*.png'
     ]}
 
-    if sys.version_info[0] == 3:
+    if six.PY3:
         packages.extend(
             [
                 'pybitmessage.bitmessagekivy',

src/addresses.py

@@ -187,7 +187,7 @@ def decodeAddress(address):
         integer = decodeBase58(address)
     if integer == 0:
         status = 'invalidcharacters'
-        return status, 0, 0, ''
+        return status, 0, 0, b''
     # after converting to hex, the string will be prepended
     # with a 0x and appended with a L in python2
     hexdata = hex(integer)[2:].rstrip('L')
@@ -200,31 +200,31 @@ def decodeAddress(address):
 
     if checksum != double_sha512(data[:-4])[0:4]:
         status = 'checksumfailed'
-        return status, 0, 0, ''
+        return status, 0, 0, b''
 
     try:
         addressVersionNumber, bytesUsedByVersionNumber = decodeVarint(data[:9])
     except varintDecodeError as e:
         logger.error(str(e))
         status = 'varintmalformed'
-        return status, 0, 0, ''
+        return status, 0, 0, b''
 
     if addressVersionNumber > 4:
         logger.error('cannot decode address version numbers this high')
         status = 'versiontoohigh'
-        return status, 0, 0, ''
+        return status, 0, 0, b''
     elif addressVersionNumber == 0:
         logger.error('cannot decode address version numbers of zero.')
         status = 'versiontoohigh'
-        return status, 0, 0, ''
+        return status, 0, 0, b''
 
     try:
         streamNumber, bytesUsedByStreamNumber = \
             decodeVarint(data[bytesUsedByVersionNumber:])
     except varintDecodeError as e:
         logger.error(str(e))
         status = 'varintmalformed'
-        return status, 0, 0, ''
+        return status, 0, 0, b''
 
     status = 'success'
     if addressVersionNumber == 1:
@@ -242,21 +242,21 @@ def decodeAddress(address):
             return status, addressVersionNumber, streamNumber, \
                 b'\x00\x00' + embeddedRipeData
         elif len(embeddedRipeData) < 18:
-            return 'ripetooshort', 0, 0, ''
+            return 'ripetooshort', 0, 0, b''
         elif len(embeddedRipeData) > 20:
-            return 'ripetoolong', 0, 0, ''
-        return 'otherproblem', 0, 0, ''
+            return 'ripetoolong', 0, 0, b''
+        return 'otherproblem', 0, 0, b''
     elif addressVersionNumber == 4:
         embeddedRipeData = \
             data[bytesUsedByVersionNumber + bytesUsedByStreamNumber:-4]
         if embeddedRipeData[0:1] == b'\x00':
             # In order to enforce address non-malleability, encoded
             # RIPE data must have NULL bytes removed from the front
-            return 'encodingproblem', 0, 0, ''
+            return 'encodingproblem', 0, 0, b''
         elif len(embeddedRipeData) > 20:
-            return 'ripetoolong', 0, 0, ''
+            return 'ripetoolong', 0, 0, b''
         elif len(embeddedRipeData) < 4:
-            return 'ripetooshort', 0, 0, ''
+            return 'ripetooshort', 0, 0, b''
         x00string = b'\x00' * (20 - len(embeddedRipeData))
         return status, addressVersionNumber, streamNumber, \
             x00string + embeddedRipeData