Replace wait_for with wait.

twisteroidambassador · twisteroidambassador · commit 513f7f911690 · 2022-10-19T12:02:17.000+08:00
This solution is compatible with all Python versions, and should pass all tests.
diff --git a/Lib/asyncio/staggered.py b/Lib/asyncio/staggered.py
@@ -2,11 +2,9 @@
 
 __all__ = 'staggered_race',
 
-import contextlib
 import typing
 
 from . import events
-from . import exceptions as exceptions_mod
 from . import locks
 from . import tasks
 
@@ -83,12 +81,11 @@ async def run_one_coro(
             previous_failed: typing.Optional[locks.Event]) -> None:
         # Wait for the previous task to finish, or for delay seconds
         if previous_failed is not None:
-            with contextlib.suppress(exceptions_mod.TimeoutError):
-                # Use asyncio.wait_for() instead of asyncio.wait() here, so
-                # that if we get cancelled at this point, Event.wait() is also
-                # cancelled, otherwise there will be a "Task destroyed but it is
-                # pending" later.
-                await tasks.wait_for(previous_failed.wait(), delay)
+            wait_task = tasks.create_task(previous_failed.wait())
+            try:
+                await tasks.wait((wait_task,), timeout=delay)
+            finally:
+                wait_task.cancel()
         # Get the next coroutine to run
         try:
             this_index, coro_fn = next(enum_coro_fns)
