refactor: Removed version-specific code paths for pytest versions lower than 8.2

Author: seifertm

pytest_asyncio/plugin.py

@@ -35,6 +35,7 @@
     Class,
     Collector,
     Config,
+    FixtureDef,
     FixtureRequest,
     Function,
     Item,
@@ -62,12 +63,6 @@
 FixtureFunction = Union[SimpleFixtureFunction, FactoryFixtureFunction]
 FixtureFunctionMarker = Callable[[FixtureFunction], FixtureFunction]
 
-# https://github.com/pytest-dev/pytest/commit/fb55615d5e999dd44306596f340036c195428ef1
-if pytest.version_tuple < (8, 0):
-    FixtureDef = Any
-else:
-    from pytest import FixtureDef
-
 
 class PytestAsyncioError(Exception):
     """Base class for exceptions raised by pytest-asyncio"""
@@ -320,8 +315,7 @@ def _wrap_asyncgen_fixture(fixturedef: FixtureDef) -> None:
 
     @functools.wraps(fixture)
     def _asyncgen_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
-        unittest = fixturedef.unittest if hasattr(fixturedef, "unittest") else False
-        func = _perhaps_rebind_fixture_func(fixture, request.instance, unittest)
+        func = _perhaps_rebind_fixture_func(fixture, request.instance, False)
         event_loop_fixture_id = _get_event_loop_fixture_id_for_async_fixture(
             request, func
         )
@@ -330,15 +324,15 @@ def _asyncgen_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
         gen_obj = func(**_add_kwargs(func, kwargs, event_loop, request))
 
         async def setup():
-            res = await gen_obj.__anext__()
+            res = await gen_obj.__anext__()  # type: ignore[union-attr]
             return res
 
         def finalizer() -> None:
             """Yield again, to finalize."""
 
             async def async_finalizer() -> None:
                 try:
-                    await gen_obj.__anext__()
+                    await gen_obj.__anext__()  # type: ignore[union-attr]
                 except StopAsyncIteration:
                     pass
                 else:
@@ -352,16 +346,15 @@ async def async_finalizer() -> None:
         request.addfinalizer(finalizer)
         return result
 
-    fixturedef.func = _asyncgen_fixture_wrapper
+    fixturedef.func = _asyncgen_fixture_wrapper  # type: ignore[misc]
 
 
 def _wrap_async_fixture(fixturedef: FixtureDef) -> None:
     fixture = fixturedef.func
 
     @functools.wraps(fixture)
     def _async_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
-        unittest = False if pytest.version_tuple >= (8, 2) else fixturedef.unittest
-        func = _perhaps_rebind_fixture_func(fixture, request.instance, unittest)
+        func = _perhaps_rebind_fixture_func(fixture, request.instance, False)
         event_loop_fixture_id = _get_event_loop_fixture_id_for_async_fixture(
             request, func
         )
@@ -374,7 +367,7 @@ async def setup():
 
         return event_loop.run_until_complete(setup())
 
-    fixturedef.func = _async_fixture_wrapper
+    fixturedef.func = _async_fixture_wrapper  # type: ignore[misc]
 
 
 def _get_event_loop_fixture_id_for_async_fixture(

tests/test_is_async_test.py

@@ -1,6 +1,5 @@
 from textwrap import dedent
 
-import pytest
 from pytest import Pytester
 
 
@@ -74,10 +73,7 @@ def pytest_collection_modifyitems(items):
         )
     )
     result = pytester.runpytest("--asyncio-mode=strict")
-    if pytest.version_tuple < (8,):
-        result.assert_outcomes(skipped=1)
-    else:
-        result.assert_outcomes(failed=1)
+    result.assert_outcomes(failed=1)
 
 
 def test_returns_true_for_unmarked_coroutine_item_in_auto_mode(pytester: Pytester):