diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-11-15 14:06:38 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-11-15 14:06:38 +0100 |
| commit | 463a908705674b9411a01b7a696c84348ec0244e (patch) | |
| tree | dcdd19ec88b198ab43b6f6d19e08e558e289dddb | |
| parent | d24ffe1cfadca8fdc37a7b2fb5c2f080c785ad1b (diff) | |
[ted] simplify
| -rw-r--r-- | youtube_dl/extractor/ted.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py index 76cfdfb90..8001ca5a3 100644 --- a/youtube_dl/extractor/ted.py +++ b/youtube_dl/extractor/ted.py @@ -85,7 +85,7 @@ class TEDIE(SubtitlesInfoExtractor): 'ext': 'mp4', 'url': stream['file'], 'format': stream['id'] - } for stream in info['htmlStreams']] + } for stream in info['htmlStreams']] video_id = info['id'] @@ -95,7 +95,7 @@ class TEDIE(SubtitlesInfoExtractor): self._list_available_subtitles(video_id, webpage) return - info = { + return { 'id': video_id, 'title': title, 'thumbnail': thumbnail, @@ -104,11 +104,6 @@ class TEDIE(SubtitlesInfoExtractor): 'formats': formats, } - # TODO: Remove when #980 has been merged - info.update(info['formats'][-1]) - - return info - def _get_available_subtitles(self, video_id, webpage): try: options = self._search_regex(r'(?:<select name="subtitles_language_select" id="subtitles_language_select">)(.*?)(?:</select>)', webpage, 'subtitles_language_select', flags=re.DOTALL) |