♻️ move sane_wait_for to private

Author: Paillat-dev

discord/state.py

@@ -43,7 +43,7 @@
     Union,
 )
 
-from .utils.private import parse_time
+from .utils.private import parse_time, sane_wait_for
 from . import utils
 from .utils.private import get_as_snowflake
 from .activity import BaseActivity
@@ -1937,7 +1937,7 @@ async def _delay_ready(self) -> None:
                     )
                     if len(current_bucket) >= max_concurrency:
                         try:
-                            await utils.sane_wait_for(current_bucket, timeout=max_concurrency * 70.0)
+                            await sane_wait_for(current_bucket, timeout=max_concurrency * 70.0)
                         except asyncio.TimeoutError:
                             fmt = "Shard ID %s failed to wait for chunks from a sub-bucket with length %d"
                             _log.warning(fmt, guild.shard_id, len(current_bucket))
@@ -1959,7 +1959,7 @@ async def _delay_ready(self) -> None:
             # 110 reqs/minute w/ 1 req/guild plus some buffer
             timeout = 61 * (len(children) / 110)
             try:
-                await utils.sane_wait_for(futures, timeout=timeout)
+                await sane_wait_for(futures, timeout=timeout)
             except asyncio.TimeoutError:
                 _log.warning(
                     ("Shard ID %s failed to wait for chunks (timeout=%.2f) for %d guilds"),

discord/utils/__init__.py

@@ -26,7 +26,6 @@
 from __future__ import annotations
 
 import array
-import asyncio
 import collections.abc
 import datetime
 import json
@@ -303,16 +302,6 @@ def _to_json(obj: Any) -> str:
     _from_json = json.loads
 
 
-async def sane_wait_for(futures, *, timeout):
-    ensured = [asyncio.ensure_future(fut) for fut in futures]
-    done, pending = await asyncio.wait(ensured, timeout=timeout, return_when=asyncio.ALL_COMPLETED)
-
-    if len(pending) != 0:
-        raise asyncio.TimeoutError()
-
-    return done
-
-
 def get_slots(cls: type[Any]) -> Iterator[str]:
     for mro in reversed(cls.__mro__):
         try:

discord/utils/private.py

@@ -401,3 +401,13 @@ async def maybe_awaitable(f: Callable[P, T | Awaitable[T]], *args: P.args, **kwa
         reveal_type(f)
         return await value
     return value
+
+
+async def sane_wait_for(futures: Iterable[Awaitable[T]], *, timeout: float) -> set[asyncio.Future[T]]:
+    ensured = [asyncio.ensure_future(fut) for fut in futures]
+    done, pending = await asyncio.wait(ensured, timeout=timeout, return_when=asyncio.ALL_COMPLETED)
+
+    if len(pending) != 0:
+        raise asyncio.TimeoutError()
+
+    return done

discord/voice_client.py

@@ -56,6 +56,7 @@
 from .player import AudioPlayer, AudioSource
 from .sinks import RawData, RecordingException, Sink
 from .utils import MISSING
+from .utils.private import sane_wait_for
 
 if TYPE_CHECKING:
     from . import abc
@@ -392,7 +393,7 @@ async def connect(self, *, reconnect: bool, timeout: float) -> None:
             await self.voice_connect()
 
             try:
-                await utils.sane_wait_for(futures, timeout=timeout)
+                await sane_wait_for(futures, timeout=timeout)
             except asyncio.TimeoutError:
                 await self.disconnect(force=True)
                 raise