X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fgamespot.py;h=c9598ad3aa68eb940a8995fb0f739dbfb9d33fdf;hb=91a76c40c06ce8ac66f4faa951176b691c3b1f90;hp=380ebbe556355b8fc0f49e825fa15433d5180b0b;hpb=dfa50793d8541ff2c5603f7c3b727c0f6e551d8d;p=youtube-dl diff --git a/youtube_dl/extractor/gamespot.py b/youtube_dl/extractor/gamespot.py index 380ebbe55..c9598ad3a 100644 --- a/youtube_dl/extractor/gamespot.py +++ b/youtube_dl/extractor/gamespot.py @@ -28,7 +28,7 @@ class GameSpotIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) page_id = mobj.group('page_id') webpage = self._download_webpage(url, page_id) - data_video_json = self._search_regex(r'data-video=\'(.*?)\'', webpage, u'data video') + data_video_json = self._search_regex(r'data-video=["\'](.*?)["\']', webpage, 'data video') data_video = json.loads(unescapeHTML(data_video_json)) # Transform the manifest url to a link to the mp4 files @@ -36,7 +36,7 @@ class GameSpotIE(InfoExtractor): f4m_url = data_video['videoStreams']['f4m_stream'] f4m_path = compat_urlparse.urlparse(f4m_url).path QUALITIES_RE = r'((,\d+)+,?)' - qualities = self._search_regex(QUALITIES_RE, f4m_path, u'qualities').strip(',').split(',') + qualities = self._search_regex(QUALITIES_RE, f4m_path, 'qualities').strip(',').split(',') http_path = f4m_path[1:].split('/', 1)[1] http_template = re.sub(QUALITIES_RE, r'%s', http_path) http_template = http_template.replace('.csmil/manifest.f4m', '')