Update upstream source from tag 'upstream/2019.01.17'

[youtubedl] / youtube_dl / extractor / ted.py

diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py
index 212ac80abb52ec98c887b9652234fdb50bb81717..d3e4205f50472d8ea0a485f25a146e97be558aff 100644 (file)
--- a/youtube_dl/extractor/ted.py
+++ b/youtube_dl/extractor/ted.py
@@ -203,17 +203,13 @@ class TEDIE(InfoExtractor):
                 ext_url = None
                 if service.lower() == 'youtube':
                     ext_url = external.get('code')
                 ext_url = None
                 if service.lower() == 'youtube':
                     ext_url = external.get('code')

-                return {
-                    '_type': 'url',
-                    'url': ext_url or external['uri'],
-                }
+
+                return self.url_result(ext_url or external['uri'])

 
         resources_ = player_talk.get('resources') or talk_info.get('resources')
 
         http_url = None
         for format_id, resources in resources_.items():
 
         resources_ = player_talk.get('resources') or talk_info.get('resources')
 
         http_url = None
         for format_id, resources in resources_.items():

-            if not isinstance(resources, dict):
-                continue

             if format_id == 'h264':
                 for resource in resources:
                     h264_url = resource.get('file')
             if format_id == 'h264':
                 for resource in resources:
                     h264_url = resource.get('file')


@@ -242,6 +238,8 @@ class TEDIE(InfoExtractor):
                         'tbr': int_or_none(resource.get('bitrate')),
                     })
             elif format_id == 'hls':
                         'tbr': int_or_none(resource.get('bitrate')),
                     })
             elif format_id == 'hls':

+                if not isinstance(resources, dict):
+                    continue

                 stream_url = url_or_none(resources.get('stream'))
                 if not stream_url:
                     continue
                 stream_url = url_or_none(resources.get('stream'))
                 if not stream_url:
                     continue