aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-22 22:31:19 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-22 22:31:19 +0100
commit12ed57418c9c46b483ccd326a13724d91c2b911d (patch)
tree3d2363f359956cb87fa92ed3ce9d1cb47238d892 /youtube_dl/extractor
parent8b1be5cd73d4b9af7ac4bcf24cec0383ba674c24 (diff)
[gamespot] Fix regexp
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/gamespot.py4
1 files changed, 2 insertions, 2 deletions
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', '')