Merge pull request #66 from twisted/6

add 6 support

Author: altendky

.github/workflows/ci.yml

@@ -76,13 +76,29 @@ jobs:
         wrapper:
           - name: PyQt5
             tox: pyqt5
+            major: 5
+          - name: PyQt6
+            tox: pyqt6
+            major: 6
           - name: PySide2
             tox: pyside2
+            major: 5
+          - name: PySide6
+            tox: pyside6
+            major: 6
         exclude:
           - python:
               tox: py311
             wrapper:
               tox: pyside2
+          - python:
+              tox: py35
+            wrapper:
+              major: 6
+          - python:
+              tox: py36
+            wrapper:
+              major: 6
     steps:
       - uses: actions/checkout@v2
       - name: Set up ${{ matrix.python.name }}

setup.py

@@ -51,12 +51,18 @@ def read(fname):
         "pyqt5": [
             "pyqt5",
         ],
+        "pyqt6": [
+            "pyqt6",
+        ],
         "pyside2": [
             # != 5.15.0 for:
             #   https://bugreports.qt.io/browse/PYSIDE-1317
             #   https://github.com/pytest-dev/pytest-twisted/pull/107#issuecomment-643679361
             "pyside2 != 5.15.0",
         ],
+        "pyside6": [
+            "pyside6",
+        ],
         "test": [
             "coverage",
             "pytest",

src/qt5reactor/core.py

@@ -106,21 +106,53 @@
 
 import sys
 
+failures = {}
+found = False
+
 try:
     # try PyQt5
     from PyQt5.QtCore import (
         QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
     )
-except ImportError as e0:
-    try:
-        # try PySide2
-        from PySide2.QtCore import (
-            QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
-        )
-    except ImportError as e1:
-        raise ImportError(
-            "Neither PyQt5 nor PySide2 installed.\nPyQt5: {}\nPySide2: {})".format(e0, e1)
-        )
+except ImportError as e:
+    failures["PyQt5"] = e
+else:
+    found = True
+
+try:
+    # try PyQt6
+    from PyQt6.QtCore import (
+        QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
+    )
+except ImportError as e:
+    failures["PyQt6"] = e
+else:
+    found = True
+
+try:
+    # try PySide2
+    from PySide2.QtCore import (
+        QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
+    )
+except ImportError as e:
+    failures["PySide2"] = e
+else:
+    found = True
+
+try:
+    # try PySide6
+    from PySide6.QtCore import (
+        QCoreApplication, QEventLoop, QObject, QSocketNotifier, QTimer,
+    )
+except ImportError as e:
+    failures["PySide6"] = e
+else:
+    found = True
+
+if not found:
+    raise ImportError(
+        "No supported Qt wrapper found.\n{}".format("\n".join("{}: {}".format(k, v) for k, v in failures.items()))
+    )
 
 from twisted.internet.error import ReactorAlreadyInstalledError
 from twisted.internet import posixbase
@@ -143,7 +175,7 @@ def __init__(self, parent, reactor, watcher, socketType):
         fd = watcher.fileno()
         self.notifier = QSocketNotifier(fd, socketType, parent)
         self.notifier.setEnabled(True)
-        if socketType == QSocketNotifier.Read:
+        if socketType == QSocketNotifier.Type.Read:
             self.fn = self.read
         else:
             self.fn = self.write
@@ -238,11 +270,11 @@ def _add(self, xer, primary, type):
 
     def addReader(self, reader):
         """Add a FileDescriptor for notification of data available to read."""
-        self._add(reader, self._reads, QSocketNotifier.Read)
+        self._add(reader, self._reads, QSocketNotifier.Type.Read)
 
     def addWriter(self, writer):
         """Add a FileDescriptor for notification of data available to write."""
-        self._add(writer, self._writes, QSocketNotifier.Write)
+        self._add(writer, self._writes, QSocketNotifier.Type.Write)
 
     def _remove(self, xer, primary):
         """
@@ -318,7 +350,13 @@ def run(self, installSignalHandlers=True):
         else:
             self._blockApp = QEventLoop()
         self.runReturn(installSignalHandlers=installSignalHandlers)
-        self._blockApp.exec_()
+
+        exec_method = getattr(self._blockApp, "exec", None)
+        if exec_method is None:
+            exec_method = self._blockApp.exec_
+
+        exec_method()
+
         if self.running:
             self.stop()
             self.runUntilCurrent()

tox.ini

@@ -1,12 +1,14 @@
 [tox]
 minversion=3.1
-envlist = py{35,36,37,38,39,310,311}-py{qt5,side2}
+envlist = py{35,36,37,38,39,310,311}-py{qt5,qt6,side2,side6}
 
 [testenv]
 extras=
     test
     pyqt5: pyqt5
+    pyqt6: pyqt6
     pyside2: pyside2
+    pyside6: pyside6
 passenv=
     TOXENV
     CI