aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorRandom User <rndusr@posteo.de>2017-03-25 19:38:30 +0100
committerRandom User <rndusr@posteo.de>2017-03-25 19:38:30 +0100
commitc73e330e7adc9c0c15ac51aeea8fbb7dad95351a (patch)
treef2b5d00d905bbea3c738831aa49efb9370bc8469 /youtube_dl/extractor/generic.py
parent03486dbb0133e42074c272f60e24f18c856fdf0d (diff)
_find_jwplayer_data() returns dict or None
This simplifies code for callers of `_find_jwplayer_data()` which no longer have to run `_parse_json()` on the return value. It also makes sure that `_find_jwplayer_data()` returns either a `dict` or `None` and nothing else.
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index c8c103ae3..3fe0237b6 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -2518,14 +2518,10 @@ class GenericIE(InfoExtractor):
self._sort_formats(entry['formats'])
return self.playlist_result(entries)
- jwplayer_data_str = self._find_jwplayer_data(webpage)
- if jwplayer_data_str:
- try:
- jwplayer_data = self._parse_json(
- jwplayer_data_str, video_id, transform_source=js_to_json)
- return self._parse_jwplayer_data(jwplayer_data, video_id)
- except ExtractorError:
- pass
+ jwplayer_data = self._find_jwplayer_data(
+ webpage, video_id, transform_source=js_to_json)
+ if jwplayer_data:
+ return self._parse_jwplayer_data(jwplayer_data, video_id)
def check_video(vurl):
if YoutubeIE.suitable(vurl):