be a package

Author: altendky

pytest_twisted/__init__.py

@@ -0,0 +1,8 @@
+from pytest_twisted.core import (
+    async_fixture,
+    async_yield_fixture,
+    blockon,
+    ensureDeferred,
+    init_default_reactor,
+    inlineCallbacks,
+)

pytest_twisted.py renamed to pytest_twisted/core.py

@@ -14,6 +14,11 @@
 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
@@ -244,6 +249,7 @@ def _set_mark(o, mark):
 
 
 def _marked_async_fixture(mark):
+    print(pytest)
     @functools.wraps(pytest.fixture)
     @_optional_arguments()
     def fixture(f, *args, **kwargs):
@@ -308,39 +314,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)
-
-    if sys.version_info >= (3,):
-        return arg_value
-    else:
-        defer.returnValue(arg_value)
-
-
 @defer.inlineCallbacks
 def _tear_it_down(deferred):
     """Tear down a specific async yield fixture."""
@@ -405,28 +378,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)
-
-    return result
-
-
 @pytest.fixture(scope="session", autouse=True)
 def twisted_greenlet():
     """Provide the twisted greenlet in fixture form."""

pytest_twisted/three.py

@@ -0,0 +1,57 @@
+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.core import _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.core 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

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.core 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

setup.py

@@ -43,5 +43,5 @@
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
-    entry_points={"pytest11": ["twisted = pytest_twisted"]},
+    entry_points={"pytest11": ["twisted = pytest_twisted.core"]},
 )

testing/conftest.py

@@ -1,10 +1,10 @@
 import pytest
-import pytest_twisted
+import pytest_twisted.core
 
 
 pytest_plugins = "pytester"
 
 
 @pytest.hookimpl(tryfirst=True)
 def pytest_configure(config):
-    pytest_twisted._use_asyncio_selector_if_required(config=config)
+    pytest_twisted.core._use_asyncio_selector_if_required(config=config)

testing/test_basic.py

@@ -62,12 +62,12 @@ def format_run_result_output_for_assert(run_result):
 def _default_conftest(testdir):
     testdir.makeconftest(textwrap.dedent("""
     import pytest
-    import pytest_twisted
+    import pytest_twisted.core
 
 
     @pytest.hookimpl(tryfirst=True)
     def pytest_configure(config):
-        pytest_twisted._use_asyncio_selector_if_required(config=config)
+        pytest_twisted.core._use_asyncio_selector_if_required(config=config)
     """))
 
 
@@ -954,11 +954,12 @@ def test_blockon_in_hook_with_asyncio(testdir, cmd_opts, request):
     conftest_file = """
     import pytest
     import pytest_twisted
+    import pytest_twisted.core
     from twisted.internet import defer
 
     @pytest.hookimpl(tryfirst=True)
     def pytest_configure(config):
-        pytest_twisted._use_asyncio_selector_if_required(config=config)
+        pytest_twisted.core._use_asyncio_selector_if_required(config=config)
 
         pytest_twisted.init_asyncio_reactor()
         d = defer.Deferred()
@@ -986,12 +987,12 @@ def test_wrong_reactor_with_asyncio(testdir, cmd_opts, request):
     skip_if_reactor_not(request, "asyncio")
     conftest_file = """
     import pytest
-    import pytest_twisted
+    import pytest_twisted.core
 
 
     @pytest.hookimpl(tryfirst=True)
     def pytest_configure(config):
-        pytest_twisted._use_asyncio_selector_if_required(config=config)
+        pytest_twisted.core._use_asyncio_selector_if_required(config=config)
 
     def pytest_addhooks():
         import twisted.internet.default
@@ -1142,12 +1143,12 @@ async def test_self_isinstance(self, foo):
 def test_import_pytest_twisted_in_conftest_py_not_a_problem(testdir, cmd_opts):
     conftest_file = """
     import pytest
-    import pytest_twisted
+    import pytest_twisted.core
 
 
     @pytest.hookimpl(tryfirst=True)
     def pytest_configure(config):
-        pytest_twisted._use_asyncio_selector_if_required(config=config)
+        pytest_twisted.core._use_asyncio_selector_if_required(config=config)
     """
     testdir.makeconftest(conftest_file)
     test_file = """