]> jfr.im git - yt-dlp.git/commitdiff
[ie/abematv] Fix proxy handling (#8046)
authorSevenLives <redacted>
Sat, 16 Sep 2023 09:37:04 +0000 (17:37 +0800)
committerGitHub <redacted>
Sat, 16 Sep 2023 09:37:04 +0000 (09:37 +0000)
Fixes https://github.com/yt-dlp/yt-dlp/issues/8036

Authored by: SevenLives

yt_dlp/extractor/abematv.py

index 163b83c6dae04c9eed255505cd6c90e43dc069f1..2a093580ccc1d40a916556f664ff0b9ec7feb91e 100644 (file)
@@ -12,7 +12,7 @@
 import urllib.request
 import urllib.response
 import uuid
-
+from ..utils.networking import clean_proxies
 from .common import InfoExtractor
 from ..aes import aes_ecb_decrypt
 from ..utils import (
@@ -35,7 +35,10 @@ def add_opener(ydl, handler):  # FIXME: Create proper API in .networking
     rh = ydl._request_director.handlers['Urllib']
     if 'abematv-license' in rh._SUPPORTED_URL_SCHEMES:
         return
-    opener = rh._get_instance(cookiejar=ydl.cookiejar, proxies=ydl.proxies)
+    headers = ydl.params['http_headers'].copy()
+    proxies = ydl.proxies.copy()
+    clean_proxies(proxies, headers)
+    opener = rh._get_instance(cookiejar=ydl.cookiejar, proxies=proxies)
     assert isinstance(opener, urllib.request.OpenerDirector)
     opener.add_handler(handler)
     rh._SUPPORTED_URL_SCHEMES = (*rh._SUPPORTED_URL_SCHEMES, 'abematv-license')