From: Sergey M․ <dstftw@gmail.com>
Date: Mon, 15 Feb 2016 14:54:01 +0000 (+0600)
Subject: [canvas] Improve subtitles (Closes #8537)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=fd7a3ea4a41ccad37c932662d39e159854311357;p=youtube-dl

[canvas] Improve subtitles (Closes #8537)
---

diff --git a/youtube_dl/extractor/canvas.py b/youtube_dl/extractor/canvas.py
index 16f458d6c..54b535ae9 100644
--- a/youtube_dl/extractor/canvas.py
+++ b/youtube_dl/extractor/canvas.py
@@ -53,15 +53,14 @@ class CanvasIE(InfoExtractor):
                     'url': format_url,
                 })
         self._sort_formats(formats)
-        
+
         subtitles = {}
-        for target in data['subtitleUrls']:
-            format_url, format_type = target.get('url'), target.get('type')
-            if format_type == 'CLOSED':
-                subtitles['nl'] = [{
-                    'ext': 'vtt',
-                    'url': format_url,
-                }]
+        subtitle_urls = data.get('subtitleUrls')
+        if isinstance(subtitle_urls, list):
+            for subtitle in subtitle_urls:
+                subtitle_url = subtitle.get('url')
+                if subtitle_url and subtitle.get('type') == 'CLOSED':
+                    subtitles.setdefault('nl', []).append({'url': subtitle_url})
 
         return {
             'id': video_id,