Skip to content

Commit 2fb3b19

Browse files
ffissoreseifertm
authored andcommitted
Backported #800 to the 0.21.1 tag
This unblocks all users stuck with 0.21.1 due to #706
1 parent a10cbde commit 2fb3b19

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

pytest_asyncio/plugin.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def _add_kwargs(
240240
func: Callable[..., Any],
241241
kwargs: Dict[str, Any],
242242
event_loop: asyncio.AbstractEventLoop,
243-
request: SubRequest,
243+
request: FixtureRequest,
244244
) -> Dict[str, Any]:
245245
sig = inspect.signature(func)
246246
ret = kwargs.copy()
@@ -277,9 +277,8 @@ def _wrap_asyncgen_fixture(fixturedef: FixtureDef) -> None:
277277
def _asyncgen_fixture_wrapper(
278278
event_loop: asyncio.AbstractEventLoop, request: SubRequest, **kwargs: Any
279279
):
280-
func = _perhaps_rebind_fixture_func(
281-
fixture, request.instance, fixturedef.unittest
282-
)
280+
unittest = False if pytest.version_tuple >= (8, 2) else fixturedef.unittest
281+
func = _perhaps_rebind_fixture_func(fixture, request.instance, unittest)
283282
gen_obj = func(**_add_kwargs(func, kwargs, event_loop, request))
284283

285284
async def setup():
@@ -315,9 +314,8 @@ def _wrap_async_fixture(fixturedef: FixtureDef) -> None:
315314
def _async_fixture_wrapper(
316315
event_loop: asyncio.AbstractEventLoop, request: SubRequest, **kwargs: Any
317316
):
318-
func = _perhaps_rebind_fixture_func(
319-
fixture, request.instance, fixturedef.unittest
320-
)
317+
unittest = False if pytest.version_tuple >= (8, 2) else fixturedef.unittest
318+
func = _perhaps_rebind_fixture_func(fixture, request.instance, unittest)
321319

322320
async def setup():
323321
res = await func(**_add_kwargs(func, kwargs, event_loop, request))

0 commit comments

Comments
 (0)