merge

Author: elenakrittik

disnake/gateway.py

@@ -165,6 +165,11 @@ def __init__(
         *args: Any,
         ws: HeartbeatWebSocket,
         interval: float,
+        # this loop sharing is necessary because KeepAliveHandler calls HeartbeatWebSocket's
+        # async methods and you can't run tasks made using one loop in another
+        # ("task attached to a different loop"), so the KeepAliveHandler's thread has to
+        # have access to main (this) thread's asyncio loop, and the only way for it to
+        # access said loop is to directly pass it as an object
         loop: asyncio.AbstractEventLoop,
         shard_id: int | None = None,
         **kwargs: Any,
@@ -587,7 +592,7 @@ async def received_message(self, raw_msg: str | bytes, /) -> None:
                     ws=self,
                     interval=interval,
                     shard_id=self.shard_id,
-                    loop=asyncio.get_running_loop(),  # share loop to the thread
+                    loop=asyncio.get_running_loop(),
                 )
                 self._keep_alive.name = "disnake heartbeat thread"
                 # send a heartbeat immediately

disnake/player.py

@@ -704,6 +704,7 @@ def __init__(
         self,
         source: AudioSource,
         client: VoiceClient,
+        # see KeepAliveHandler's reasoning for sharing the loop
         loop: asyncio.AbstractEventLoop,
         *,
         after=None,

disnake/utils.py

@@ -56,29 +56,10 @@
 from .enums import Locale
 
 if sys.version_info >= (3, 14):
-    import threading
     from inspect import iscoroutinefunction as iscoroutinefunction
-
-    def get_event_loop():
-        try:
-            # If there is no event loop, this will raise a RuntimeError starting with Python 3.14+.
-            # In that case, we create and set a new loop below.
-            # This is more of a bandaid fix, we should really use asyncio.run in the long term.
-            return asyncio.get_event_loop()
-        except RuntimeError:
-            if threading.current_thread() is not threading.main_thread():
-                raise
-            asyncio.set_event_loop(loop := asyncio.new_event_loop())
-            return loop
 else:
     from asyncio import iscoroutinefunction as iscoroutinefunction
 
-    def get_event_loop():
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            # get_event_loop emits deprecation warnings in 3.10-3.13
-            return asyncio.get_event_loop()
-
 
 try:
     import orjson