mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
Revert "Install our own HTTPS handler as well (#1309)"
This reverts commit 36399e8576
and fixes #1322.
This commit is contained in:
parent
443c12a703
commit
acebc9cd6b
@ -476,7 +476,7 @@ def formatSeconds(secs):
|
|||||||
def make_HTTPS_handler(opts):
|
def make_HTTPS_handler(opts):
|
||||||
if sys.version_info < (3,2):
|
if sys.version_info < (3,2):
|
||||||
# Python's 2.x handler is very simplistic
|
# Python's 2.x handler is very simplistic
|
||||||
return YoutubeDLHandlerHTTPS()
|
return compat_urllib_request.HTTPSHandler()
|
||||||
else:
|
else:
|
||||||
import ssl
|
import ssl
|
||||||
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
|
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
|
||||||
@ -485,7 +485,7 @@ def make_HTTPS_handler(opts):
|
|||||||
context.verify_mode = (ssl.CERT_NONE
|
context.verify_mode = (ssl.CERT_NONE
|
||||||
if opts.no_check_certificate
|
if opts.no_check_certificate
|
||||||
else ssl.CERT_REQUIRED)
|
else ssl.CERT_REQUIRED)
|
||||||
return YoutubeDLHandlerHTTPS(context=context)
|
return compat_urllib_request.HTTPSHandler(context=context)
|
||||||
|
|
||||||
class ExtractorError(Exception):
|
class ExtractorError(Exception):
|
||||||
"""Error during info extraction."""
|
"""Error during info extraction."""
|
||||||
@ -569,8 +569,7 @@ def __init__(self, downloaded, expected):
|
|||||||
self.downloaded = downloaded
|
self.downloaded = downloaded
|
||||||
self.expected = expected
|
self.expected = expected
|
||||||
|
|
||||||
|
class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
|
||||||
class YoutubeDLHandler_Template: # Old-style class, like HTTPHandler
|
|
||||||
"""Handler for HTTP requests and responses.
|
"""Handler for HTTP requests and responses.
|
||||||
|
|
||||||
This class, when installed with an OpenerDirector, automatically adds
|
This class, when installed with an OpenerDirector, automatically adds
|
||||||
@ -603,8 +602,8 @@ def addinfourl_wrapper(stream, headers, url, code):
|
|||||||
ret.code = code
|
ret.code = code
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def _http_request(self, req):
|
def http_request(self, req):
|
||||||
for h, v in std_headers.items():
|
for h,v in std_headers.items():
|
||||||
if h in req.headers:
|
if h in req.headers:
|
||||||
del req.headers[h]
|
del req.headers[h]
|
||||||
req.add_header(h, v)
|
req.add_header(h, v)
|
||||||
@ -619,7 +618,7 @@ def _http_request(self, req):
|
|||||||
del req.headers['Youtubedl-user-agent']
|
del req.headers['Youtubedl-user-agent']
|
||||||
return req
|
return req
|
||||||
|
|
||||||
def _http_response(self, req, resp):
|
def http_response(self, req, resp):
|
||||||
old_resp = resp
|
old_resp = resp
|
||||||
# gzip
|
# gzip
|
||||||
if resp.headers.get('Content-encoding', '') == 'gzip':
|
if resp.headers.get('Content-encoding', '') == 'gzip':
|
||||||
@ -633,16 +632,8 @@ def _http_response(self, req, resp):
|
|||||||
resp.msg = old_resp.msg
|
resp.msg = old_resp.msg
|
||||||
return resp
|
return resp
|
||||||
|
|
||||||
|
https_request = http_request
|
||||||
class YoutubeDLHandler(YoutubeDLHandler_Template, compat_urllib_request.HTTPHandler):
|
https_response = http_response
|
||||||
http_request = YoutubeDLHandler_Template._http_request
|
|
||||||
http_response = YoutubeDLHandler_Template._http_response
|
|
||||||
|
|
||||||
|
|
||||||
class YoutubeDLHandlerHTTPS(YoutubeDLHandler_Template, compat_urllib_request.HTTPSHandler):
|
|
||||||
https_request = YoutubeDLHandler_Template._http_request
|
|
||||||
https_response = YoutubeDLHandler_Template._http_response
|
|
||||||
|
|
||||||
|
|
||||||
def unified_strdate(date_str):
|
def unified_strdate(date_str):
|
||||||
"""Return a string with the date in the format YYYYMMDD"""
|
"""Return a string with the date in the format YYYYMMDD"""
|
||||||
|
Loading…
Reference in New Issue
Block a user