youtube-dl

commit 6e4b8b28916aaafc6d1b4b4d69a6f667e35d413f
parent 5dadae079bd053c822353b081e94d9daff333208
Author: Sergey M․ <dstftw@gmail.com>
Date:   Mon, 26 Oct 2015 20:35:28 +0600

[francetv] Make subtitles more robust (Closes #7298)

Diffstat:
M
youtube_dl/extractor/francetv.py
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
@@ -84,14 +84,12 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
             title += ' - %s' % subtitle
 
         subtitles = {}
-        for subtitle_accessibilite in info['subtitles']:
-            if subtitle_accessibilite['url'] is not '':
-                if not subtitles:
-                    subtitles['fr'] = []
-                subtitles['fr'].append({
-                    'ext': subtitle_accessibilite['format'],
-                    'url': subtitle_accessibilite['url'],
-                })
+        subtitles_list = [{
+            'url': subtitle['url'],
+            'ext': subtitle.get('format'),
+        } for subtitle in info.get('subtitles', []) if subtitle.get('url')]
+        if subtitles_list:
+            subtitles['fr'] = subtitles_list
 
         return {
             'id': video_id,