X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/9b8ee23b99de91f9e463050baddfd76fa6580ad6..059bc4db1975698dca53278a0fcc23d428b7658a:/yt_dlp/utils.py diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 7f0c055ac..0171394fc 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -5221,7 +5221,8 @@ class WebSocketsWrapper(): pool = None def __init__(self, url, headers=None, connect=True): - self.loop = asyncio.events.new_event_loop() + self.loop = asyncio.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')) @@ -5251,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.coroutines.iscoroutine(main): + if not asyncio.iscoroutine(main): raise ValueError(f'a coroutine was expected, got {main!r}') try: @@ -5263,7 +5264,7 @@ def run_with_loop(main, loop): @staticmethod def _cancel_all_tasks(loop): - to_cancel = asyncio.tasks.all_tasks(loop) + to_cancel = asyncio.all_tasks(loop) if not to_cancel: return @@ -5271,8 +5272,9 @@ 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)) + asyncio.gather(*to_cancel, loop=loop, return_exceptions=True)) for task in to_cancel: if task.cancelled():