diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-11-28 00:17:12 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-11-28 00:17:12 +0100 |
| commit | 9f37a9594147b71b1ce796219f75fc3a2bb544d3 (patch) | |
| tree | ffa94d68ab9203dd6caf7f0b25f4de46cae9fbb9 /youtube_dl/InfoExtractors.py | |
| parent | a130bc6d024e9bfa3c7f8742f8bf5038b2c6e363 (diff) | |
| download | youtube-dl-9f37a9594147b71b1ce796219f75fc3a2bb544d3.tar.xz | |
Py2/3 parse_qs compatibility
Diffstat (limited to 'youtube_dl/InfoExtractors.py')
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index f64b88d55..32cdee2ce 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -11,7 +11,6 @@ import email.utils import xml.etree.ElementTree import random import math -from urlparse import parse_qs from utils import * @@ -329,7 +328,7 @@ class YoutubeIE(InfoExtractor): request = compat_urllib_request.Request(video_info_url) try: video_info_webpage = compat_urllib_request.urlopen(request).read() - video_info = parse_qs(video_info_webpage) + video_info = compat_parse_qs(video_info_webpage) if 'token' in video_info: break except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: @@ -437,7 +436,7 @@ class YoutubeIE(InfoExtractor): video_url_list = [(None, video_info['conn'][0])] elif 'url_encoded_fmt_stream_map' in video_info and len(video_info['url_encoded_fmt_stream_map']) >= 1: url_data_strs = video_info['url_encoded_fmt_stream_map'][0].split(',') - url_data = [parse_qs(uds) for uds in url_data_strs] + url_data = [compat_parse_qs(uds) for uds in url_data_strs] url_data = filter(lambda ud: 'itag' in ud and 'url' in ud, url_data) url_map = dict((ud['itag'][0], ud['url'][0] + '&signature=' + ud['sig'][0]) for ud in url_data) @@ -594,7 +593,7 @@ class MetacafeIE(InfoExtractor): if mobj is None: self._downloader.trouble(u'ERROR: unable to extract media URL') return - vardict = parse_qs(mobj.group(1)) + vardict = compat_parse_qs(mobj.group(1)) if 'mediaData' not in vardict: self._downloader.trouble(u'ERROR: unable to extract media URL') return |