projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 2020.05.03
[youtube-dl]
/
youtube_dl
/
extractor
/
ccma.py
diff --git
a/youtube_dl/extractor/ccma.py
b/youtube_dl/extractor/ccma.py
index 07f5206c124e42368809ceb89149c3b5a9d5bdf7..544647f92b7594e50be813b9666a7d381a7722fe 100644
(file)
--- a/
youtube_dl/extractor/ccma.py
+++ b/
youtube_dl/extractor/ccma.py
@@
-4,13
+4,13
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import compat_str
from ..utils import (
clean_html,
int_or_none,
parse_duration,
parse_iso8601,
parse_resolution,
from ..utils import (
clean_html,
int_or_none,
parse_duration,
parse_iso8601,
parse_resolution,
+ url_or_none,
)
)
@@
-53,8
+53,8
@@
class CCMAIE(InfoExtractor):
media_url = media['media']['url']
if isinstance(media_url, list):
for format_ in media_url:
media_url = media['media']['url']
if isinstance(media_url, list):
for format_ in media_url:
- format_url =
format_.get('file'
)
- if not format_url
or not isinstance(format_url, compat_str)
:
+ format_url =
url_or_none(format_.get('file')
)
+ if not format_url:
continue
label = format_.get('label')
f = parse_resolution(label)
continue
label = format_.get('label')
f = parse_resolution(label)