From fb2f5e0d70c904c64415e50e33c5d7157c729ef7 Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Wed, 27 Jun 2018 17:44:55 +0300 Subject: [PATCH] Changed check_pyqt() to work with qtpy (closes #897) --- src/depends.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/depends.py b/src/depends.py index e775d06a8a..c2ea55cdf3 100755 --- a/src/depends.py +++ b/src/depends.py @@ -385,21 +385,21 @@ def check_pyqt(): Here we are checking for PyQt4 with its version, as for it require PyQt 4.8 or later. """ - QtCore = try_import( - 'qtpy.QtCore', 'PyBitmessage requires PyQt 4.8 or later and Qt 4.7 or later.') + qtpy = try_import( + 'qtpy', 'PyBitmessage requires qtpy, PyQt 4.8 or later and Qt 4.7 or later.') - if not QtCore: + if not qtpy: return False - logger.info('PyQt Version: %s', QtCore.PYQT_VERSION_STR) - logger.info('Qt Version: %s', QtCore.QT_VERSION_STR) + logger.info('PyQt Version: %s', qtpy.PYQT_VERSION) + logger.info('Qt Version: %s', qtpy.QT_VERSION) passed = True - if QtCore.PYQT_VERSION < 0x40800: + if qtpy.PYQT_VERSION < '4.8': logger.error( 'This version of PyQt is too old. PyBitmessage requries' ' PyQt 4.8 or later.') passed = False - if QtCore.QT_VERSION < 0x40700: + if qtpy.QT_VERSION < '4.7': logger.error( 'This version of Qt is too old. PyBitmessage requries' ' Qt 4.7 or later.')