projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "invalid escape sequences" error on Python 3.6
[youtube-dl]
/
youtube_dl
/
extractor
/
metacafe.py
diff --git
a/youtube_dl/extractor/metacafe.py
b/youtube_dl/extractor/metacafe.py
index acab81863c2f5601b1e1f3d13dbc677e701966a8..9880924e692380fffde3d0c776da329225de4ef8 100644
(file)
--- a/
youtube_dl/extractor/metacafe.py
+++ b/
youtube_dl/extractor/metacafe.py
@@
-133,7
+133,7
@@
class MetacafeIE(InfoExtractor):
video_id, display_id = re.match(self._VALID_URL, url).groups()
# the video may come from an external site
video_id, display_id = re.match(self._VALID_URL, url).groups()
# the video may come from an external site
- m_external = re.match('^(\w{2})-(.*)$', video_id)
+ m_external = re.match(
r
'^(\w{2})-(.*)$', video_id)
if m_external is not None:
prefix, ext_id = m_external.groups()
# Check if video comes from YouTube
if m_external is not None:
prefix, ext_id = m_external.groups()
# Check if video comes from YouTube
@@
-234,9
+234,8
@@
class MetacafeIE(InfoExtractor):
source_url = source.get('src')
if not source_url:
continue
source_url = source.get('src')
if not source_url:
continue
- mime_type = source.get('type')
- ext = mimetype2ext(mime_type) or determine_ext(source_url)
- if mime_type == 'application/x-mpegURL' or ext == 'm3u8':
+ ext = mimetype2ext(source.get('type')) or determine_ext(source_url)
+ if ext == 'm3u8':
video_url.extend(self._extract_m3u8_formats(
source_url, video_id, 'mp4',
'm3u8_native', m3u8_id='hls', fatal=False))
video_url.extend(self._extract_m3u8_formats(
source_url, video_id, 'mp4',
'm3u8_native', m3u8_id='hls', fatal=False))