Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[utils] Separate codes for handling Youtubedl-* headers

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-11-29 12:42:50 +08:00
parent 46b4070f3f
commit 87f0e62d94
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/utils.py
View File

@ -663,6 +663,15 @@ def _create_http_connection(ydl_handler, http_class, is_https, *args, **kwargs):
return hc return hc
def handle_youtubedl_headers(headers):
if 'Youtubedl-no-compression' in headers:
filtered_headers = dict((k, v) for k, v in headers.items() if k.lower() != 'accept-encoding')
del filtered_headers['Youtubedl-no-compression']
return filtered_headers
return headers
class YoutubeDLHandler(compat_urllib_request.HTTPHandler): class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
"""Handler for HTTP requests and responses. """Handler for HTTP requests and responses.
@ -731,10 +740,8 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
# The dict keys are capitalized because of this bug by urllib # The dict keys are capitalized because of this bug by urllib
if h.capitalize() not in req.headers: if h.capitalize() not in req.headers:
req.add_header(h, v) req.add_header(h, v)
if 'Youtubedl-no-compression' in req.headers:
if 'Accept-encoding' in req.headers: req.headers = handle_youtubedl_headers(req.headers)
del req.headers['Accept-encoding']
del req.headers['Youtubedl-no-compression']
if sys.version_info < (2, 7) and '#' in req.get_full_url(): if sys.version_info < (2, 7) and '#' in req.get_full_url():
# Python 2.6 is brain-dead when it comes to fragments # Python 2.6 is brain-dead when it comes to fragments