Merge pull request #109 from altendky/drop_qt5reactor_workaround

Shift workaround to qt5reactor

Author: altendky

pytest_twisted.py

@@ -7,8 +7,7 @@
 import greenlet
 import pytest
 
-from twisted.internet import defer
-# from twisted.internet import error
+from twisted.internet import defer, error
 from twisted.internet.threads import blockingCallFromThread
 from twisted.python import failure
 
@@ -401,14 +400,9 @@ def init_asyncio_reactor():
 
 def _install_reactor(reactor_installer, reactor_type):
     """Install the specified reactor and create the greenlet."""
-    # TODO: maybe fix this in qt5reactor?  btw, it avoids creating a second
-    #       qt5reactor.core.QtEventReactor and this somehow fixes the hang
-    #       that showed up in 5.15.0.
-    # try:
-    if 'twisted.internet.reactor' not in sys.modules:
+    try:
         reactor_installer()
-    # except error.ReactorAlreadyInstalledError:
-    else:
+    except error.ReactorAlreadyInstalledError:
         import twisted.internet.reactor
 
         if not isinstance(twisted.internet.reactor, reactor_type):

setup.py

@@ -15,7 +15,11 @@
     py_modules=["pytest_twisted"],
     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
     install_requires=["greenlet", "pytest>=2.3", "decorator"],
-    extras_require={"dev": ["pre-commit", "black"]},
+    extras_require={
+        "dev": ["pre-commit", "black"],
+        "pyside2": ["pyside2", "qt5reactor"],
+        "pyqt5": ["pyqt5", "qt5reactor>=0.6.2"],
+    },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",

tox.ini

@@ -15,6 +15,8 @@ deps=
     qt5reactor: pytest-xvfb
     qt5reactor: pyqt5
     qt5reactor: pywin32; sys_platform == 'win32'
+extras=
+    qt5reactor: pyqt5
 setenv=
     defaultreactor: REACTOR = default
     qt5reactor: REACTOR = qt5reactor