diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-04-04 22:23:59 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-04-04 22:23:59 +0200 |
| commit | c8edf47b3a96556c1f5d78d5b9b389b84a676bce (patch) | |
| tree | 765d801577cf8aebab15e2ec4e43ecb2cf561e51 | |
| parent | 3b4c26a4286451ca0236245fe42ae9e8b9aafff8 (diff) | |
| download | youtube-dl-c8edf47b3a96556c1f5d78d5b9b389b84a676bce.tar.gz youtube-dl-c8edf47b3a96556c1f5d78d5b9b389b84a676bce.tar.xz youtube-dl-c8edf47b3a96556c1f5d78d5b9b389b84a676bce.zip | |
[yahoo] Support https and -uploader URLs (Fixes #2701)
| -rw-r--r-- | test/test_all_urls.py | 6 | ||||
| -rw-r--r-- | youtube_dl/extractor/yahoo.py | 2 |
2 files changed, 7 insertions, 1 deletions
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<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', |