Merge branch 'master' into also_test_pyside2

Author: altendky

README.rst

@@ -7,8 +7,8 @@ pytest-twisted - test twisted code with pytest
 |PyPI| |Pythons| |Travis| |AppVeyor| |Black|
 
 :Authors: Ralf Schmitt, Kyle Altendorf, Victor Titor
-:Version: 1.12
-:Date:    2019-09-26
+:Version: 1.13.1
+:Date:    2020-09-09
 :Download: https://pypi.python.org/pypi/pytest-twisted#downloads
 :Code: https://github.com/pytest-dev/pytest-twisted
 
@@ -111,11 +111,6 @@ be explicitly installed earlier by calling
 ``pytest_twisted.init_default_reactor()`` or the corresponding function
 for the desired alternate reactor.
 
-Beware that in situations such as
-a ``conftest.py`` file that the name ``pytest_twisted`` may be
-undesirably detected by ``pytest`` as an unknown hook.  One alternative
-is to ``import pytest_twisted as pt``.
-
 
 inlineCallbacks
 ===============
@@ -164,10 +159,6 @@ async/await fixtures
 pytest fixture semantics of setup, value, and teardown.  At present only
 function and module scope are supported.
 
-Note: You must *call* ``pytest_twisted.async_fixture()`` and
-``pytest_twisted.async_yield_fixture()``.
-This requirement may be removed in a future release.
-
 .. code-block:: python
 
   # No yield (coroutine function)

pytest_twisted.py

@@ -1,14 +1,14 @@
 import functools
 import inspect
+import itertools
 import sys
 import warnings
 
 import decorator
 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
 
@@ -120,6 +120,56 @@ def decorator_apply(dec, func):
         dict(decfunc=dec(func)), __wrapped__=func)
 
 
+class DecoratorArgumentsError(Exception):
+    pass
+
+
+def repr_args_kwargs(*args, **kwargs):
+    arguments = ', '.join(itertools.chain(
+        (repr(x) for x in args),
+        ('{}={}'.format(k, repr(v)) for k, v in kwargs.items())
+    ))
+
+    return '({})'.format(arguments)
+
+
+def positional_not_allowed_exception(*args, **kwargs):
+    arguments = repr_args_kwargs(*args, **kwargs)
+
+    return DecoratorArgumentsError(
+        'Positional decorator arguments not allowed: {}'.format(arguments),
+    )
+
+
+def _optional_arguments():
+    def decorator_decorator(d):
+        # TODO: this should get the signature of d minus the f or something
+        def decorator_wrapper(*args, **decorator_arguments):
+            """this is decorator_wrapper"""
+            if len(args) > 1:
+                raise positional_not_allowed_exception()
+
+            if len(args) == 1:
+                maybe_f = args[0]
+
+                if len(decorator_arguments) > 0 or not callable(maybe_f):
+                    raise positional_not_allowed_exception()
+
+                f = maybe_f
+                return d(f)
+
+            # TODO: this should get the signature of d minus the kwargs
+            def decorator_closure_on_arguments(f):
+                return d(f, **decorator_arguments)
+
+            return decorator_closure_on_arguments
+
+        return decorator_wrapper
+
+    return decorator_decorator
+
+
+@_optional_arguments()
 def inlineCallbacks(f):
     """
     Mark as inline callbacks test for pytest-twisted processing and apply
@@ -136,6 +186,7 @@ def inlineCallbacks(f):
     return decorated
 
 
+@_optional_arguments()
 def ensureDeferred(f):
     """
     Mark as async test for pytest-twisted processing.
@@ -178,7 +229,8 @@ def _set_mark(o, mark):
 
 def _marked_async_fixture(mark):
     @functools.wraps(pytest.fixture)
-    def fixture(*args, **kwargs):
+    @_optional_arguments()
+    def fixture(f, *args, **kwargs):
         try:
             scope = args[0]
         except IndexError:
@@ -198,13 +250,10 @@ def fixture(*args, **kwargs):
             #       https://github.com/pytest-dev/pytest-twisted/issues/56
             raise AsyncFixtureUnsupportedScopeError.from_scope(scope=scope)
 
-        def decorator(f):
-            _set_mark(f, mark)
-            result = pytest.fixture(*args, **kwargs)(f)
-
-            return result
+        _set_mark(f, mark)
+        result = pytest.fixture(*args, **kwargs)(f)
 
-        return decorator
+        return result
 
     return fixture
 
@@ -274,12 +323,6 @@ def tear_it_down(deferred):
         yield deferred
     except StopAsyncIteration:
         return
-    except Exception:   # as e:
-        pass
-        # e = e
-    else:
-        pass
-        # e = None
 
     # TODO: six.raise_from()
     raise AsyncGeneratorFixtureDidNotStopError.from_generator(
@@ -401,14 +444,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

@@ -5,8 +5,8 @@
 
 setup(
     name="pytest-twisted",
-    version="1.12",
-    description="A twisted plugin for py.test.",
+    version="1.13.1",
+    description="A twisted plugin for pytest.",
     long_description=long_description,
     long_description_content_type="text/x-rst",
     author="Ralf Schmitt, Kyle Altendorf, Victor Titor",
@@ -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",