Skip to content

Commit cdd2c49

Browse files
bluetechseifertm
authored andcommitted
Use FixtureRequest instead of SubRequest
`SubRequest` is a subclass of `FixtureRequest`, but is currently private so pytest-asyncio uses `Any` instead. However, `FixtureRequest` typing is sufficient for our needs, so can use that instead.
1 parent c3429fa commit cdd2c49

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pytest_asyncio/plugin.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464

6565
# https://github.com/pytest-dev/pytest/pull/9510
6666
FixtureDef = Any
67-
SubRequest = Any
6867

6968

7069
class PytestAsyncioError(Exception):
@@ -282,7 +281,7 @@ def _add_kwargs(
282281
kwargs: Dict[str, Any],
283282
event_loop_fixture_id: str,
284283
event_loop: asyncio.AbstractEventLoop,
285-
request: SubRequest,
284+
request: FixtureRequest,
286285
) -> Dict[str, Any]:
287286
sig = inspect.signature(func)
288287
ret = kwargs.copy()
@@ -316,7 +315,7 @@ def _wrap_asyncgen_fixture(fixturedef: FixtureDef, event_loop_fixture_id: str) -
316315
fixture = fixturedef.func
317316

318317
@functools.wraps(fixture)
319-
def _asyncgen_fixture_wrapper(request: SubRequest, **kwargs: Any):
318+
def _asyncgen_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
320319
func = _perhaps_rebind_fixture_func(
321320
fixture, request.instance, fixturedef.unittest
322321
)
@@ -355,7 +354,7 @@ def _wrap_async_fixture(fixturedef: FixtureDef, event_loop_fixture_id: str) -> N
355354
fixture = fixturedef.func
356355

357356
@functools.wraps(fixture)
358-
def _async_fixture_wrapper(request: SubRequest, **kwargs: Any):
357+
def _async_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
359358
func = _perhaps_rebind_fixture_func(
360359
fixture, request.instance, fixturedef.unittest
361360
)

0 commit comments

Comments
 (0)