16
16
17
17
import logging
18
18
import os
19
+ from distutils import version
19
20
from importlib import import_module
20
21
21
22
# We can now use logging so set up a simple configuration
@@ -385,21 +386,21 @@ def check_pyqt():
385
386
Here we are checking for PyQt4 with its version, as for it require
386
387
PyQt 4.8 or later.
387
388
"""
388
- QtCore = try_import (
389
- 'qtpy.QtCore ' , 'PyBitmessage requires PyQt 4.8 or later and Qt 4.7 or later.' )
389
+ qtpy = try_import (
390
+ 'qtpy' , 'PyBitmessage requires qtpy, PyQt 4.8 or later and Qt 4.7 or later.' )
390
391
391
- if not QtCore :
392
+ if not qtpy :
392
393
return False
393
394
394
- logger .info ('PyQt Version: %s' , QtCore . PYQT_VERSION_STR )
395
- logger .info ('Qt Version: %s' , QtCore . QT_VERSION_STR )
395
+ logger .info ('PyQt Version: %s' , qtpy . PYQT_VERSION )
396
+ logger .info ('Qt Version: %s' , qtpy . QT_VERSION )
396
397
passed = True
397
- if QtCore . PYQT_VERSION < 0x40800 :
398
+ if version . LooseVersion ( qtpy . PYQT_VERSION ) < '4.8' :
398
399
logger .error (
399
400
'This version of PyQt is too old. PyBitmessage requries'
400
401
' PyQt 4.8 or later.' )
401
402
passed = False
402
- if QtCore . QT_VERSION < 0x40700 :
403
+ if version . LooseVersion ( qtpy . QT_VERSION ) < '4.7' :
403
404
logger .error (
404
405
'This version of Qt is too old. PyBitmessage requries'
405
406
' Qt 4.7 or later.' )
@@ -408,7 +409,7 @@ def check_pyqt():
408
409
409
410
410
411
def check_msgpack ():
411
- """Do sgpack module check.
412
+ """Do msgpack module check.
412
413
413
414
simply checking if msgpack package with all its dependency
414
415
is available or not as recommended for messages coding.
0 commit comments