Merge pull request #184 from pytest-dev/less_return_value

become a full package... and `return` not `defer.returnValue()`

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+ignore =
+    N802
+
+per-file-ignores =
+    src/pytest_twisted/__init__.py: F401

setup.py

@@ -1,9 +1,9 @@
-from setuptools import setup
+import setuptools
 
 with open("README.rst") as f:
     long_description = f.read()
 
-setup(
+setuptools.setup(
     name="pytest-twisted",
     version="1.14.2",
     description="A twisted plugin for pytest.",
@@ -12,7 +12,8 @@
     author="Ralf Schmitt, Kyle Altendorf, Victor Titor",
     author_email="sda@fstab.net",
     url="https://github.com/pytest-dev/pytest-twisted",
-    py_modules=["pytest_twisted"],
+    packages=setuptools.find_packages('src'),
+    package_dir={'': 'src'},
     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*',
     install_requires=["greenlet", "pytest>=2.3", "decorator"],
     extras_require={

pytest_twisted.py → src/pytest_twisted/__init__.py

@@ -14,6 +14,14 @@
 from twisted.internet.threads import blockingCallFromThread
 from twisted.python import failure
 
+if sys.version_info[0] == 3:
+    from pytest_twisted.three import (
+        _async_pytest_fixture_setup,
+        _async_pytest_pyfunc_call,
+    )
+elif sys.version_info[0] == 2:
+    from pytest_twisted.two import _async_pytest_pyfunc_call
+
 
 class WrongReactorAlreadyInstalledError(Exception):
     pass
@@ -308,36 +316,6 @@ def finalizer():
     return finalizer
 
 
-@defer.inlineCallbacks
-def _async_pytest_fixture_setup(fixturedef, request, mark):
-    """Setup an async or async yield fixture."""
-    fixture_function = fixturedef.func
-
-    kwargs = {
-        name: request.getfixturevalue(name)
-        for name in fixturedef.argnames
-    }
-
-    if mark == 'async_fixture':
-        arg_value = yield defer.ensureDeferred(
-            fixture_function(**kwargs)
-        )
-    elif mark == 'async_yield_fixture':
-        coroutine = fixture_function(**kwargs)
-
-        request.addfinalizer(
-            _create_async_yield_fixture_finalizer(coroutine=coroutine),
-        )
-
-        arg_value = yield defer.ensureDeferred(coroutine.__anext__())
-    else:
-        raise UnrecognizedCoroutineMarkError.from_mark(mark=mark)
-
-    fixturedef.cached_result = (arg_value, fixturedef.cache_key(request), None)
-
-    defer.returnValue(arg_value)
-
-
 @defer.inlineCallbacks
 def _tear_it_down(deferred):
     """Tear down a specific async yield fixture."""
@@ -402,28 +380,6 @@ def inner_test(**kwargs):
     return result
 
 
-@defer.inlineCallbacks
-def _async_pytest_pyfunc_call(pyfuncitem, f, kwargs):
-    """Run test function."""
-    fixture_kwargs = {
-        name: value
-        for name, value in pyfuncitem.funcargs.items()
-        if name in pyfuncitem._fixtureinfo.argnames
-    }
-    kwargs.update(fixture_kwargs)
-
-    maybe_mark = _get_mark(f)
-    if maybe_mark == 'async_test':
-        result = yield defer.ensureDeferred(f(**kwargs))
-    elif maybe_mark == 'inline_callbacks_test':
-        result = yield f(**kwargs)
-    else:
-        # TODO: maybe deprecate this
-        result = yield f(**kwargs)
-
-    defer.returnValue(result)
-
-
 @pytest.fixture(scope="session", autouse=True)
 def twisted_greenlet():
     """Provide the twisted greenlet in fixture form."""

src/pytest_twisted/three.py

@@ -0,0 +1,60 @@
+from twisted.internet import defer
+
+
+@defer.inlineCallbacks
+def _async_pytest_fixture_setup(fixturedef, request, mark):
+    """Setup an async or async yield fixture."""
+    from pytest_twisted import (
+        UnrecognizedCoroutineMarkError,
+        _create_async_yield_fixture_finalizer,
+    )
+
+    fixture_function = fixturedef.func
+
+    kwargs = {
+        name: request.getfixturevalue(name)
+        for name in fixturedef.argnames
+    }
+
+    if mark == 'async_fixture':
+        arg_value = yield defer.ensureDeferred(
+            fixture_function(**kwargs)
+        )
+    elif mark == 'async_yield_fixture':
+        coroutine = fixture_function(**kwargs)
+
+        request.addfinalizer(
+            _create_async_yield_fixture_finalizer(coroutine=coroutine),
+        )
+
+        arg_value = yield defer.ensureDeferred(coroutine.__anext__())
+    else:
+        raise UnrecognizedCoroutineMarkError.from_mark(mark=mark)
+
+    fixturedef.cached_result = (arg_value, fixturedef.cache_key(request), None)
+
+    return arg_value
+
+
+@defer.inlineCallbacks
+def _async_pytest_pyfunc_call(pyfuncitem, f, kwargs):
+    """Run test function."""
+    from pytest_twisted import _get_mark
+
+    fixture_kwargs = {
+        name: value
+        for name, value in pyfuncitem.funcargs.items()
+        if name in pyfuncitem._fixtureinfo.argnames
+    }
+    kwargs.update(fixture_kwargs)
+
+    maybe_mark = _get_mark(f)
+    if maybe_mark == 'async_test':
+        result = yield defer.ensureDeferred(f(**kwargs))
+    elif maybe_mark == 'inline_callbacks_test':
+        result = yield f(**kwargs)
+    else:
+        # TODO: maybe deprecate this
+        result = yield f(**kwargs)
+
+    return result

src/pytest_twisted/two.py

@@ -0,0 +1,25 @@
+from twisted.internet import defer
+
+
+@defer.inlineCallbacks
+def _async_pytest_pyfunc_call(pyfuncitem, f, kwargs):
+    """Run test function."""
+    from pytest_twisted import _get_mark
+
+    fixture_kwargs = {
+        name: value
+        for name, value in pyfuncitem.funcargs.items()
+        if name in pyfuncitem._fixtureinfo.argnames
+    }
+    kwargs.update(fixture_kwargs)
+
+    maybe_mark = _get_mark(f)
+    if maybe_mark == 'async_test':
+        result = yield defer.ensureDeferred(f(**kwargs))
+    elif maybe_mark == 'inline_callbacks_test':
+        result = yield f(**kwargs)
+    else:
+        # TODO: maybe deprecate this
+        result = yield f(**kwargs)
+
+    defer.returnValue(result)

tox.ini

@@ -30,7 +30,4 @@ download=true
 
 [testenv:linting]
 deps=flake8
-commands=flake8 setup.py pytest_twisted.py testing
-
-[flake8]
-ignore=N802
+commands=flake8 setup.py src/pytest_twisted testing