ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow Qt lib selection from environment variable for testing

Browse Source 
Cover up some QtTest differences between PyQt4 / PyQt5
This commit is contained in:
Luke Campagnola 2016-06-05 00:48:13 -07:00
parent 2e59cd63cb
commit 230659a4db
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pyqtgraph/Qt.py
View File

@ -9,7 +9,7 @@ This module exists to smooth out some of the differences between PySide and PyQt
""" """
import sys, re, time import os, sys, re, time
from .python2_3 import asUnicode from .python2_3 import asUnicode
@ -17,17 +17,19 @@ PYSIDE = 'PySide'
PYQT4 = 'PyQt4' PYQT4 = 'PyQt4'
PYQT5 = 'PyQt5' PYQT5 = 'PyQt5'
QT_LIB = None QT_LIB = os.getenv('PYQTGRAPH_QT_LIB')
## Automatically determine whether to use PyQt or PySide. ## Automatically determine whether to use PyQt or PySide (unless specified by
## environment variable).
## This is done by first checking to see whether one of the libraries ## This is done by first checking to see whether one of the libraries
## is already imported. If not, then attempt to import PyQt4, then PySide. ## is already imported. If not, then attempt to import PyQt4, then PySide.
libOrder = [PYQT4, PYSIDE, PYQT5] if QT_LIB is None:
libOrder = [PYQT4, PYSIDE, PYQT5]
for lib in libOrder: for lib in libOrder:
if lib in sys.modules: if lib in sys.modules:
QT_LIB = lib QT_LIB = lib
break break
if QT_LIB is None: if QT_LIB is None:
for lib in libOrder: for lib in libOrder:
@ -38,7 +40,7 @@ if QT_LIB is None:
except ImportError: except ImportError:
pass pass
if QT_LIB == None: if QT_LIB is None:
raise Exception("PyQtGraph requires one of PyQt4, PyQt5 or PySide; none of these packages could be imported.") raise Exception("PyQtGraph requires one of PyQt4, PyQt5 or PySide; none of these packages could be imported.")
if QT_LIB == PYSIDE: if QT_LIB == PYSIDE:
@ -157,6 +159,11 @@ elif QT_LIB == PYQT5:
from PyQt5 import QtOpenGL from PyQt5 import QtOpenGL
except ImportError: except ImportError:
pass pass
try:
from PyQt5 import QtTest
QtTest.QTest.qWaitForWindowShown = QtTest.QTest.qWaitForWindowExposed
except ImportError:
pass
# Re-implement deprecated APIs # Re-implement deprecated APIs
def scale(self, sx, sy): def scale(self, sx, sy):
@ -200,6 +207,9 @@ elif QT_LIB == PYQT5:
VERSION_INFO = 'PyQt5 ' + QtCore.PYQT_VERSION_STR + ' Qt ' + QtCore.QT_VERSION_STR VERSION_INFO = 'PyQt5 ' + QtCore.PYQT_VERSION_STR + ' Qt ' + QtCore.QT_VERSION_STR
else:
raise ValueError("Invalid Qt lib '%s'" % QT_LIB)
# Common to PyQt4 and 5 # Common to PyQt4 and 5
if QT_LIB.startswith('PyQt'): if QT_LIB.startswith('PyQt'):
import sip import sip