From c8edf47b3a96556c1f5d78d5b9b389b84a676bce Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Fri, 4 Apr 2014 22:23:59 +0200 Subject: [PATCH] [yahoo] Support https and -uploader URLs (Fixes #2701) --- test/test_all_urls.py | 6 ++++++ 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 index bea8c41fb..577f6ac32 100644 --- 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 index c1de172b1..e2cf1ae56 100644 --- 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\d*?)\.html' + _VALID_URL = r'https?://screen\.yahoo\.com/.*?-(?P[0-9]+)(?:-[a-z]+)?\.html' _TESTS = [ { 'url': 'http://screen.yahoo.com/julian-smith-travis-legg-watch-214727115.html',