]> jfr.im git - yt-dlp.git/blobdiff - yt_dlp/downloader/websocket.py
[cleanup] Minor fixes (See desc)
[yt-dlp.git] / yt_dlp / downloader / websocket.py
index daac348842c8462b911d4f777c97381bd595aab5..727a15828e21df0dc39efc08ab1a8f4ae253621c 100644 (file)
@@ -1,19 +1,12 @@
+import contextlib
 import os
 import signal
-import asyncio
 import threading
 
-try:
-    import websockets
-except (ImportError, SyntaxError):
-    # websockets 3.10 on python 3.6 causes SyntaxError
-    # See https://github.com/yt-dlp/yt-dlp/issues/2633
-    has_websockets = False
-else:
-    has_websockets = True
-
 from .common import FileDownloader
 from .external import FFmpegFD
+from ..compat import asyncio
+from ..dependencies import websockets
 
 
 class FFmpegSinkFD(FileDownloader):
@@ -26,14 +19,12 @@ def real_download(self, filename, info_dict):
         async def call_conn(proc, stdin):
             try:
                 await self.real_connection(stdin, info_dict)
-            except (BrokenPipeError, OSError):
+            except OSError:
                 pass
             finally:
-                try:
+                with contextlib.suppress(OSError):
                     stdin.flush()
                     stdin.close()
-                except OSError:
-                    pass
                 os.kill(os.getpid(), signal.SIGINT)
 
         class FFmpegStdinFD(FFmpegFD):