mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-22 16:57:40 +00:00
Wrap call to addinfourl for compatibility with Python 2.4
This commit is contained in:
parent
0d14e225fa
commit
7b531c0be6
1 changed files with 8 additions and 2 deletions
10
youtube-dl
10
youtube-dl
|
@ -189,6 +189,12 @@ class YoutubeDLHandler(urllib2.HTTPHandler):
|
|||
except zlib.error:
|
||||
return zlib.decompress(data)
|
||||
|
||||
@staticmethod
|
||||
def addinfourl_wrapper(stream, headers, url, code):
|
||||
if hasattr(urllib2.addinfourl, 'getcode'):
|
||||
return urllib2.addinfourl(stream, headers, url, code)
|
||||
return urllib2.addinfourl(stream, headers, url)
|
||||
|
||||
def http_request(self, req):
|
||||
for h in std_headers:
|
||||
if h in req.headers:
|
||||
|
@ -205,12 +211,12 @@ class YoutubeDLHandler(urllib2.HTTPHandler):
|
|||
# gzip
|
||||
if resp.headers.get('Content-encoding', '') == 'gzip':
|
||||
gz = gzip.GzipFile(fileobj=StringIO.StringIO(resp.read()), mode='r')
|
||||
resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url)
|
||||
resp = self.addinfourl_wrapper(gz, old_resp.headers, old_resp.url, old_resp.code)
|
||||
resp.msg = old_resp.msg
|
||||
# deflate
|
||||
if resp.headers.get('Content-encoding', '') == 'deflate':
|
||||
gz = StringIO.StringIO(self.deflate(resp.read()))
|
||||
resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url)
|
||||
resp = self.addinfourl_wrapper(gz, old_resp.headers, old_resp.url, old_resp.code)
|
||||
resp.msg = old_resp.msg
|
||||
return resp
|
||||
|
||||
|
|
Loading…
Reference in a new issue