Adding PyQt5 support

- Updated travis
- Now PYTEST_QT_FORCE_PYQT may assume values "4" or "5"
  to choose which PyQt API to use
- qt_compat now has to be aware of the differences between
  PyQt4 and PyQt5

Author: nicoddemus

.travis.yml

@@ -8,12 +8,14 @@ virtualenv:
   system_site_packages: true  
 
 env:
- - PYTEST_VERSION=2.6.4 PYTEST_QT_FORCE_PYQT=true
- - PYTEST_VERSION=2.6.4 PYTEST_QT_FORCE_PYQT=false
- - PYTEST_VERSION=2.7.0 PYTEST_QT_FORCE_PYQT=true
- - PYTEST_VERSION=2.7.0 PYTEST_QT_FORCE_PYQT=false
+# - PYTEST_VERSION=2.6.4 PYTEST_QT_FORCE_PYQT=true
+# - PYTEST_VERSION=2.6.4 PYTEST_QT_FORCE_PYQT=false
+# - PYTEST_VERSION=2.7.0 PYTEST_QT_FORCE_PYQT=true
+ - PYTEST_VERSION=2.7.0 PYTEST_QT_FORCE_PYQT=4
+ - PYTEST_VERSION=2.7.0 PYTEST_QT_FORCE_PYQT=5
 
 install:
+ - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
  - sudo apt-get update
 
  # Qt

install-qt.py

@@ -12,11 +12,13 @@ def run(cmd):
         sys.exit('command %s failed with status %s' % (cmd, r))
 
 py3k = sys.version_info[0] == 3
-if os.environ['PYTEST_QT_FORCE_PYQT'] == "true":
+if os.environ['PYTEST_QT_FORCE_PYQT'] != "false":
+    pyqt_ver = os.environ['PYTEST_QT_FORCE_PYQT']
+    assert pyqt_ver in ('4', '5'), 'unexpected pyqt_version: %s' % pyqt_ver
     if py3k:
-        run('sudo apt-get install -qq python3-pyqt4')
+        run('sudo apt-get install -qq python3-pyqt%s' % pyqt_ver)
     else:
-        run('sudo apt-get install -qq python-qt4')
+        run('sudo apt-get install -qq python-qt%s' % pyqt_ver)
 else:
     if py3k:
         run('sudo apt-get install -qq python3-pyside')

pytestqt/_tests/test_basics.py

@@ -1,15 +1,16 @@
 import weakref
 import pytest
-from pytestqt.qt_compat import QtGui, Qt, QEvent, QtCore
+from pytestqt.qt_compat import QtGui, Qt, QEvent, QtCore, QApplication, \
+    QWidget
 
 
 def test_basics(qtbot):
     """
     Basic test that works more like a sanity check to ensure we are setting up a QApplication
     properly and are able to display a simple event_recorder.
     """
-    assert isinstance(QtGui.qApp, QtGui.QApplication)
-    widget = QtGui.QWidget()
+    assert QApplication.instance() is not None
+    widget = QWidget()
     qtbot.addWidget(widget)
     widget.setWindowTitle('W1')
     widget.show()
@@ -62,7 +63,7 @@ def test_stop_for_interaction(qtbot):
     """
     Test qtbot.stopForInteraction()
     """
-    widget = QtGui.QWidget()
+    widget = QWidget()
     qtbot.addWidget(widget)
     qtbot.waitForWindowShown(widget)
     QtCore.QTimer.singleShot(0, widget.close)
@@ -73,13 +74,13 @@ def test_widget_kept_as_weakref(qtbot):
     """
     Test if the widget is kept as a weak reference in QtBot
     """
-    widget = QtGui.QWidget()
+    widget = QWidget()
     qtbot.add_widget(widget)
     widget = weakref.ref(widget)
     assert widget() is None
 
 
-class EventRecorder(QtGui.QWidget):
+class EventRecorder(QWidget):
 
     """
     Widget that records some kind of events sent to it.
@@ -90,7 +91,7 @@ class EventRecorder(QtGui.QWidget):
     """
 
     def __init__(self):
-        QtGui.QWidget.__init__(self)
+        QWidget.__init__(self)
         self._event_types = {}
         self.event_data = None
 

pytestqt/_tests/test_exceptions.py

@@ -1,7 +1,7 @@
 import pytest
 import sys
 from pytestqt.plugin import capture_exceptions, format_captured_exceptions
-from pytestqt.qt_compat import QtGui, Qt, QtCore
+from pytestqt.qt_compat import QtGui, Qt, QtCore, QApplication
 
 
 pytest_plugins = 'pytester'
@@ -31,7 +31,7 @@ def test_catch_exceptions_in_virtual_methods(qtbot, raise_error):
     tests fail if any.
     """
     v = Receiver(raise_error)
-    app = QtGui.QApplication.instance()
+    app = QApplication.instance()
     app.sendEvent(v, QtCore.QEvent(QtCore.QEvent.User))
     app.sendEvent(v, QtCore.QEvent(QtCore.QEvent.User))
     app.processEvents()
@@ -67,9 +67,9 @@ def test_no_capture(testdir, no_capture_by_marker):
         ''')
     testdir.makepyfile('''
         import pytest
-        from pytestqt.qt_compat import QtGui, QtCore
+        from pytestqt.qt_compat import QWidget, QtCore
 
-        class MyWidget(QtGui.QWidget):
+        class MyWidget(QWidget):
 
             def mouseReleaseEvent(self, ev):
                 raise RuntimeError

pytestqt/plugin.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from pytestqt.qt_compat import QtCore, QtGui, QtTest
+from pytestqt.qt_compat import QtCore, QtTest, QApplication
 
 
 def _inject_qtest_methods(cls):
@@ -370,9 +370,9 @@ def qapp():
     fixture that instantiates the QApplication instance that will be used by
     the tests.
     """
-    app = QtGui.QApplication.instance()
+    app = QApplication.instance()
     if app is None:
-        app = QtGui.QApplication([])
+        app = QApplication([])
         yield app
         app.exit()
     else:

pytestqt/qt_compat.py

@@ -12,36 +12,44 @@
 
 if not on_rtd:  # pragma: no cover
     try:
-        import PySide.QtCore as _QtCore
-        QtCore = _QtCore
+        from PySide import QtCore
         USING_PYSIDE = True
     except ImportError:
         USING_PYSIDE = False
 
-    FORCE_PYQT = os.environ.get('PYTEST_QT_FORCE_PYQT', 'false') == 'true'
+    FORCE_PYQT = os.environ.get('PYTEST_QT_FORCE_PYQT', 'false') != 'false'
+    PYQT_VER = None
     if not USING_PYSIDE or FORCE_PYQT:
         try:
             import sip
         except ImportError:
             msg = 'pytest-qt requires either PyQt4 or PySide to be installed'
             raise ImportError(msg)
+
+        PYQT_VER = os.environ.get['PYTEST_QT_FORCE_PYQT']
+        # backward compatibility
+        if PYQT_VER == 'true':
+            PYQT_VER = '4'
+        if PYQT_VER not in ('4', '5'):
+            raise RuntimeError('Unsupported PyQt version: %s' % PYQT_VER)
+
         USING_PYSIDE = False
-        import PyQt4.QtCore as _QtCore
-        QtCore = _QtCore
 
     if USING_PYSIDE:
-        def _import_module(moduleName):
-            pyside = __import__('PySide', globals(), locals(), [moduleName], 0)
-            return getattr(pyside, moduleName)
+        def _import_module(module_name):
+            pyside = __import__('PySide', globals(), locals(), [module_name], 0)
+            return getattr(pyside, module_name)
 
         Signal = QtCore.Signal
         Slot = QtCore.Slot
         Property = QtCore.Property
     else:
-        def _import_module(moduleName):
-            pyside = __import__('PyQt4', globals(), locals(), [moduleName], 0)
-            return getattr(pyside, moduleName)
-    
+        def _import_module(module_name):
+            pyside = __import__('PyQt%s' % PYQT_VER,
+                                globals(), locals(), [module_name], 0)
+            return getattr(pyside, module_name)
+
+        QtCore = _import_module('QtCore')
         Signal = QtCore.pyqtSignal
         Slot = QtCore.pyqtSlot
         Property = QtCore.pyqtProperty
@@ -51,7 +59,14 @@ def _import_module(moduleName):
     QtTest = _import_module('QtTest')
     Qt = QtCore.Qt
     QEvent = QtCore.QEvent
-    
+    if not USING_PYSIDE and PYQT_VER == '5':
+        _QtWidgets = _import_module('QtWidgets')
+        QApplication = _QtWidgets.QApplication
+        QWidget = _QtWidgets.QWidget
+    else:
+        QApplication = QtGui.QApplication
+        QWidget = QtGui.QWidget
+
 else:  # pragma: no cover
     USING_PYSIDE = True
 
@@ -77,3 +92,5 @@ def __getattr__(cls, name):
     QtTest = Mock()
     Qt = Mock()
     QEvent = Mock()
+    QApplication = Mock()
+    QWidget = Mock()