youtube-dl

commit: c8edf47b3a96556c1f5d78d5b9b389b84a676bce
parent 3b4c26a4286451ca0236245fe42ae9e8b9aafff8
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Fri,  4 Apr 2014 22:23:59 +0200

[yahoo] Support https and -uploader URLs (Fixes #2701)

Diffstat:
M
test/test_all_urls.py
6
++++++
M
youtube_dl/extractor/yahoo.py
2
+-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
@@ -157,5 +157,11 @@ class TestAllURLsMatching(unittest.TestCase):
             'http://thedailyshow.cc.com/guests/michael-lewis/3efna8/exclusive---michael-lewis-extended-interview-pt--3',
             ['ComedyCentralShows'])
 
+    def test_yahoo_https(self):
+        # https://github.com/rg3/youtube-dl/issues/2701
+        self.assertMatch(
+            'https://screen.yahoo.com/smartwatches-latest-wearable-gadgets-163745379-cbs.html',
+            ['Yahoo'])
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py
@@ -15,7 +15,7 @@ from ..utils import (
 
 class YahooIE(InfoExtractor):
     IE_DESC = 'Yahoo screen'
-    _VALID_URL = r'http://screen\.yahoo\.com/.*?-(?P<id>\d*?)\.html'
+    _VALID_URL = r'https?://screen\.yahoo\.com/.*?-(?P<id>[0-9]+)(?:-[a-z]+)?\.html'
     _TESTS = [
         {
             'url': 'http://screen.yahoo.com/julian-smith-travis-legg-watch-214727115.html',