aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/tvnoe.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/tvnoe.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/tvnoe.py')
-rw-r--r--youtube_dl/extractor/tvnoe.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/youtube_dl/extractor/tvnoe.py b/youtube_dl/extractor/tvnoe.py
index 1a5b76bf2..26a5aeae4 100644
--- a/youtube_dl/extractor/tvnoe.py
+++ b/youtube_dl/extractor/tvnoe.py
@@ -31,9 +31,8 @@ class TVNoeIE(InfoExtractor):
r'<iframe[^>]+src="([^"]+)"', webpage, 'iframe URL')
ifs_page = self._download_webpage(iframe_url, video_id)
- jwplayer_data = self._parse_json(
- self._find_jwplayer_data(ifs_page),
- video_id, transform_source=js_to_json)
+ jwplayer_data = self._find_jwplayer_data(
+ ifs_page, video_id, transform_source=js_to_json)
info_dict = self._parse_jwplayer_data(
jwplayer_data, video_id, require_title=False, base_url=iframe_url)