From: Sergey M․ <dstftw@gmail.com>
Date: Mon, 26 Oct 2015 14:35:28 +0000 (+0600)
Subject: [francetv] Make subtitles more robust (Closes #7298)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=6e4b8b28916aaafc6d1b4b4d69a6f667e35d413f;p=youtube-dl

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

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index eaaa43958..07115b9d4 100644
--- 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,