projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
443c12a
)
Revert "Install our own HTTPS handler as well (#1309)"
author
Philipp Hagemeister
<phihag@phihag.de>
Tue, 27 Aug 2013 21:15:01 +0000
(23:15 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Tue, 27 Aug 2013 21:28:20 +0000
(23:28 +0200)
This reverts commit
36399e85765a6a04fd84126264af75382fcfd1f6
and fixes #1322.
youtube_dl/utils.py
patch
|
blob
|
history
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index ab1049cc0d99b17adcfc83f951d38e89a89a4bc9..52cfb8a6d18e69be0db213bbf3f4da63f1fcd7d9 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-476,7
+476,7
@@
def formatSeconds(secs):
def make_HTTPS_handler(opts):
if sys.version_info < (3,2):
# Python's 2.x handler is very simplistic
def make_HTTPS_handler(opts):
if sys.version_info < (3,2):
# Python's 2.x handler is very simplistic
- return
YoutubeDLHandlerHTTPS
()
+ return
compat_urllib_request.HTTPSHandler
()
else:
import ssl
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
else:
import ssl
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
@@
-485,7
+485,7
@@
def make_HTTPS_handler(opts):
context.verify_mode = (ssl.CERT_NONE
if opts.no_check_certificate
else ssl.CERT_REQUIRED)
context.verify_mode = (ssl.CERT_NONE
if opts.no_check_certificate
else ssl.CERT_REQUIRED)
- return
YoutubeDLHandlerHTTPS
(context=context)
+ return
compat_urllib_request.HTTPSHandler
(context=context)
class ExtractorError(Exception):
"""Error during info extraction."""
class ExtractorError(Exception):
"""Error during info extraction."""
@@
-569,8
+569,7
@@
class ContentTooShortError(Exception):
self.downloaded = downloaded
self.expected = expected
self.downloaded = downloaded
self.expected = expected
-
-class YoutubeDLHandler_Template: # Old-style class, like HTTPHandler
+class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
"""Handler for HTTP requests and responses.
This class, when installed with an OpenerDirector, automatically adds
"""Handler for HTTP requests and responses.
This class, when installed with an OpenerDirector, automatically adds
@@
-603,8
+602,8
@@
class YoutubeDLHandler_Template: # Old-style class, like HTTPHandler
ret.code = code
return ret
ret.code = code
return ret
- def
_
http_request(self, req):
- for h,
v in std_headers.items():
+ def http_request(self, req):
+ for h,v in std_headers.items():
if h in req.headers:
del req.headers[h]
req.add_header(h, v)
if h in req.headers:
del req.headers[h]
req.add_header(h, v)
@@
-619,7
+618,7
@@
class YoutubeDLHandler_Template: # Old-style class, like HTTPHandler
del req.headers['Youtubedl-user-agent']
return req
del req.headers['Youtubedl-user-agent']
return req
- def
_
http_response(self, req, resp):
+ def http_response(self, req, resp):
old_resp = resp
# gzip
if resp.headers.get('Content-encoding', '') == 'gzip':
old_resp = resp
# gzip
if resp.headers.get('Content-encoding', '') == 'gzip':
@@
-633,16
+632,8
@@
class YoutubeDLHandler_Template: # Old-style class, like HTTPHandler
resp.msg = old_resp.msg
return resp
resp.msg = old_resp.msg
return resp
-
-class YoutubeDLHandler(YoutubeDLHandler_Template, compat_urllib_request.HTTPHandler):
- 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
-
+ https_request = http_request
+ https_response = http_response
def unified_strdate(date_str):
"""Return a string with the date in the format YYYYMMDD"""
def unified_strdate(date_str):
"""Return a string with the date in the format YYYYMMDD"""