Merge remote-tracking branch 'origin/wheels'

[youtube-dl] / youtube_dl / extractor / ted.py

diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py
index b9e65447f1f69c63fc61eab1469644070e5dc5da..3968b718e9ad7a62664c3224452e6d57dce042e0 100644 (file)
--- a/youtube_dl/extractor/ted.py
+++ b/youtube_dl/extractor/ted.py
@@ -7,7 +7,6 @@ from .subtitles import SubtitlesInfoExtractor
 
 from ..utils import (
     compat_str,
-    RegexNotFoundError,
 )
 
 
@@ -23,9 +22,10 @@ class TEDIE(SubtitlesInfoExtractor):
         '''
     _TEST = {
         'url': 'http://www.ted.com/talks/dan_dennett_on_our_consciousness.html',
-        'file': '102.mp4',
         'md5': '4ea1dada91e4174b53dac2bb8ace429d',
         'info_dict': {
+            'id': '102',
+            'ext': 'mp4',
             'title': 'The illusion of consciousness',
             'description': ('Philosopher Dan Dennett makes a compelling '
                 'argument that not only don\'t we understand our own '
@@ -86,18 +86,21 @@ class TEDIE(SubtitlesInfoExtractor):
         } for (format_id, format_url) in talk_info['nativeDownloads'].items()]
         self._sort_formats(formats)
 
-        video_id = talk_info['id']
+        video_id = compat_str(talk_info['id'])
         # subtitles
         video_subtitles = self.extract_subtitles(video_id, talk_info)
         if self._downloader.params.get('listsubtitles', False):
             self._list_available_subtitles(video_id, talk_info)
             return
 
+        thumbnail = talk_info['thumb']
+        if not thumbnail.startswith('http'):
+            thumbnail = 'http://' + thumbnail
         return {
             'id': video_id,
             'title': talk_info['title'],
             'uploader': talk_info['speaker'],
-            'thumbnail': talk_info['thumb'],
+            'thumbnail': thumbnail,
             'description': self._og_search_description(webpage),
             'subtitles': video_subtitles,
             'formats': formats,