]> jfr.im git - yt-dlp.git/commitdiff
Revert acbc64225006964cf52d316e007a77a1b5e2975b
authorpukkandan <redacted>
Tue, 26 Apr 2022 00:05:06 +0000 (05:35 +0530)
committerpukkandan <redacted>
Tue, 26 Apr 2022 00:13:19 +0000 (05:43 +0530)
Reverts "[utils] WebSocketsWrapper: Ignore warnings at websockets instantiation"

The warning should not be suppressed. We need to address it

yt_dlp/utils.py

index 844b9cb19b9d92e336fd99ab10acf8af148da4b5..90f070b6d72aa60c75fcc9c1212f399bcb478faa 100644 (file)
@@ -36,7 +36,6 @@
 import time
 import traceback
 import urllib.parse
-import warnings
 import xml.etree.ElementTree
 import zlib
 
@@ -5222,23 +5221,18 @@ class WebSocketsWrapper():
     pool = None
 
     def __init__(self, url, headers=None, connect=True):
-        self.loop = asyncio.new_event_loop()
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            # https://github.com/aaugustin/websockets/blob/9c87d43f1d7bbf6847350087aae74fd35f73a642/src/websockets/legacy/client.py#L480
-            # the reason to keep giving `loop` parameter: we aren't in async function
-            self.conn = websockets.connect(
-                url, extra_headers=headers, ping_interval=None,
-                close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'))
+        self.loop = asyncio.events.new_event_loop()
+        # XXX: "loop" is deprecated
+        self.conn = websockets.connect(
+            url, extra_headers=headers, ping_interval=None,
+            close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'))
         if connect:
             self.__enter__()
         atexit.register(self.__exit__, None, None, None)
 
     def __enter__(self):
         if not self.pool:
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore")
-                self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
+            self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
         return self
 
     def send(self, *args):
@@ -5258,7 +5252,7 @@ def __exit__(self, type, value, traceback):
     # for contributors: If there's any new library using asyncio needs to be run in non-async, move these function out of this class
     @staticmethod
     def run_with_loop(main, loop):
-        if not asyncio.iscoroutine(main):
+        if not asyncio.coroutines.iscoroutine(main):
             raise ValueError(f'a coroutine was expected, got {main!r}')
 
         try:
@@ -5278,6 +5272,7 @@ def _cancel_all_tasks(loop):
         for task in to_cancel:
             task.cancel()
 
+        # XXX: "loop" is removed in python 3.10+
         loop.run_until_complete(
             asyncio.tasks.gather(*to_cancel, loop=loop, return_exceptions=True))