Update upstream source from tag 'upstream/2019.01.17'

[youtubedl] / youtube_dl / extractor / wimp.py

diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index c022fb33e94ef7f9e6f0e90d73300f866e8ffc76..ea234e3c5088f7c7c99e049ab95f1e69542dd38f 100644 (file)
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -36,14 +36,11 @@ class WimpIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         youtube_id = self._search_regex(
         webpage = self._download_webpage(url, video_id)
 
         youtube_id = self._search_regex(

-            r"videoId\s*:\s*[\"']([0-9A-Za-z_-]{11})[\"']",
+            (r"videoId\s*:\s*[\"']([0-9A-Za-z_-]{11})[\"']",
+             r'data-id=["\']([0-9A-Za-z_-]{11})'),

             webpage, 'video URL', default=None)
         if youtube_id:
             webpage, 'video URL', default=None)
         if youtube_id:

-            return {
-                '_type': 'url',
-                'url': youtube_id,
-                'ie_key': YoutubeIE.ie_key(),
-            }
+            return self.url_result(youtube_id, YoutubeIE.ie_key())

 
         info_dict = self._extract_jwplayer_data(
             webpage, video_id, require_title=False)
 
         info_dict = self._extract_jwplayer_data(
             webpage, video_id, require_title=False)