PyQt5 based qtpy fallback

Author: g1itch

setup.py

@@ -69,7 +69,8 @@ def run(self):
         'pybitmessage.pyelliptic',
         'pybitmessage.socks',
         'pybitmessage.storage',
-        'pybitmessage.plugins'
+        'pybitmessage.plugins',
+        'pybitmessage.fallback'
     ]
 
     # this will silently accept alternative providers of msgpack
@@ -83,8 +84,7 @@ def run(self):
             import umsgpack
             installRequires.append("umsgpack")
         except ImportError:
-            packages += [
-                'pybitmessage.fallback', 'pybitmessage.fallback.umsgpack']
+            packages += ['pybitmessage.fallback.umsgpack']
 
     dist = setup(
         name='pybitmessage',

src/bitmessageqt/networkstatus.py

@@ -35,10 +35,6 @@ def __init__(self, parent=None):
             header.setSortIndicator(0, QtCore.Qt.AscendingOrder)
 
         self.startup = time.localtime()
-        self.labelStartupTime.setText(_translate(
-            "networkstatus", "Since startup on {0}").format(
-                l10n.formatTimestamp(self.startup))
-        )
 
         self.UISignalThread = UISignaler.get()
         self.UISignalThread.updateNumberOfMessagesProcessed.connect(

src/bitmessageqt/support.py

@@ -126,7 +126,7 @@ def createSupportMessage(myapp):
 
     opensslversion = "%s (Python internal), %s (external for PyElliptic)" % (ssl.OPENSSL_VERSION, OpenSSL._version)
 
-    qtapi = os.environ['QT_API']
+    qtapi = os.environ.get('QT_API', 'fallback')
 
     frozen = "N/A"
     if paths.frozen:

src/depends.py

@@ -3,6 +3,8 @@
 and suggest how it may be installed
 """
 
+# flake8: noqa:E402
+
 import sys
 
 # Only really old versions of Python don't have sys.hexversion. We don't
@@ -387,9 +389,13 @@ def check_pyqt():
     PyQt 4.8 or later.
     """
     # pylint: disable=no-member
-    qtpy = try_import(
-        'qtpy',
-        'PyBitmessage requires qtpy, PyQt 4.8 or later and Qt 4.7 or later.')
+    try:
+        from fallback import qtpy
+    except ImportError:
+        logger.error(
+            'PyBitmessage requires qtpy, PyQt 4.8 or later and Qt 4.7 or later.'
+        )
+        qtpy = None
 
     if not qtpy:
         return False

src/fallback/__init__.py

@@ -1,3 +1,30 @@
 """
 .. todo:: hello world
 """
+
+try:
+    import qtpy
+except ImportError:
+    try:
+        from PyQt5 import QtCore, QtGui, QtWidgets, QtNetwork, uic
+    except ImportError:
+        qtpy = None
+    else:
+        import sys
+        import types
+
+        QtCore.Signal = QtCore.pyqtSignal
+        context = {
+            'API': 'pyqt5',  # for tr
+            'PYQT_VERSION': QtCore.PYQT_VERSION_STR,
+            'QT_VERSION': QtCore.QT_VERSION_STR,
+            'QtCore': QtCore,
+            'QtGui': QtGui,
+            'QtWidgets': QtWidgets,
+            'QtNetwork': QtNetwork,
+            'uic': uic
+        }
+        qtpy = types.ModuleType(
+            'qtpy', 'PyQt5 based dynamic fallback for qtpy')
+        qtpy.__dict__.update(context)
+        sys.modules['qtpy'] = qtpy

src/tr.py

@@ -12,6 +12,7 @@ def _tr_dummy(context, text, disambiguation=None, n=None):
 
 if state.enableGUI and not state.curses:
     try:
+        from fallback import qtpy  # noqa:F401
         from qtpy import QtWidgets, QtCore, API
     except ImportError:
         _translate = _tr_dummy