Remove async_timeout requirement

It was causing some dependency issues
Shifaau9 · May 16, 2024 · d53877f · d53877f
1 parent 2751b55
commit d53877f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 33 deletions.
diff --git a/discord/voice_state.py b/discord/voice_state.py
@@ -45,11 +45,6 @@
 import logging
 import threading
 
-try:
-    from asyncio import timeout as atimeout  # type: ignore
-except ImportError:
-    from async_timeout import timeout as atimeout  # type: ignore
-
 from typing import TYPE_CHECKING, Optional, Dict, List, Callable, Coroutine, Any, Tuple
 
 from .enums import Enum
@@ -400,37 +395,41 @@ async def _wrap_connect(self, *args: Any) -> None:
             await self.disconnect()
             raise
 
-    async def _connect(self, reconnect: bool, timeout: float, self_deaf: bool, self_mute: bool, resume: bool) -> None:
-        _log.info('Connecting to voice...')
+    async def _inner_connect(self, reconnect: bool, self_deaf: bool, self_mute: bool, resume: bool) -> None:
+        for i in range(5):
+            _log.info('Starting voice handshake... (connection attempt %d)', i + 1)
 
-        async with atimeout(timeout):
-            for i in range(5):
-                _log.info('Starting voice handshake... (connection attempt %d)', i + 1)
+            await self._voice_connect(self_deaf=self_deaf, self_mute=self_mute)
+            # Setting this unnecessarily will break reconnecting
+            if self.state is ConnectionFlowState.disconnected:
+                self.state = ConnectionFlowState.set_guild_voice_state
 
-                await self._voice_connect(self_deaf=self_deaf, self_mute=self_mute)
-                # Setting this unnecessarily will break reconnecting
-                if self.state is ConnectionFlowState.disconnected:
-                    self.state = ConnectionFlowState.set_guild_voice_state
+            await self._wait_for_state(ConnectionFlowState.got_both_voice_updates)
 
-                await self._wait_for_state(ConnectionFlowState.got_both_voice_updates)
+            _log.info('Voice handshake complete. Endpoint found: %s', self.endpoint)
 
-                _log.info('Voice handshake complete. Endpoint found: %s', self.endpoint)
+            try:
+                self.ws = await self._connect_websocket(resume)
+                await self._handshake_websocket()
+                break
+            except ConnectionClosed:
+                if reconnect:
+                    wait = 1 + i * 2.0
+                    _log.exception('Failed to connect to voice... Retrying in %ss...', wait)
+                    await self.disconnect(cleanup=False)
+                    await asyncio.sleep(wait)
+                    continue
+                else:
+                    await self.disconnect()
+                    raise
 
-                try:
-                    self.ws = await self._connect_websocket(resume)
-                    await self._handshake_websocket()
-                    break
-                except ConnectionClosed:
-                    if reconnect:
-                        wait = 1 + i * 2.0
-                        _log.exception('Failed to connect to voice... Retrying in %ss...', wait)
-                        await self.disconnect(cleanup=False)
-                        await asyncio.sleep(wait)
-                        continue
-                    else:
-                        await self.disconnect()
-                        raise
+    async def _connect(self, reconnect: bool, timeout: float, self_deaf: bool, self_mute: bool, resume: bool) -> None:
+        _log.info('Connecting to voice...')
 
+        await asyncio.wait_for(
+            self._inner_connect(reconnect=reconnect, self_deaf=self_deaf, self_mute=self_mute, resume=resume),
+            timeout=timeout,
+        )
         _log.info('Voice connection complete.')
 
         if not self._runner:
@@ -472,8 +471,7 @@ async def disconnect(self, *, force: bool = True, cleanup: bool = True, wait: bo
                 # The new VoiceConnectionState object receives the voice_state_update event containing channel=None while still
                 # connecting leaving it in a bad state.  Since there's no nice way to transfer state to the new one, we have to do this.
                 try:
-                    async with atimeout(self.timeout):
-                        await self._disconnected.wait()
+                    await asyncio.wait_for(self._disconnected.wait(), timeout=self.timeout)
                 except TimeoutError:
                     _log.debug('Timed out waiting for voice disconnection confirmation')
                 except asyncio.CancelledError:

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1 @@
 aiohttp>=3.7.4,<4
-async-timeout>=4.0,<5.0; python_version<"3.11"
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		aiohttp>=3.7.4,<4
		async-timeout>=4.0,<5.0; python_version<"3.11"