aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-04-01 00:25:11 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-04-01 00:25:11 +0200
commit651486621dd79025a1b0ea08abe786b50a9604ad (patch)
treef6b3a5a55b24b5516bae6133ce87e7bc3b4984b3
parent28d9032c88e746860b75a035b053501d3d105f8c (diff)
[comedycentral] Allow URLs with query parts (fixes #2661)
-rw-r--r--test/test_all_urls.py3
-rw-r--r--youtube_dl/extractor/comedycentral.py5
2 files changed, 6 insertions, 2 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index dffe3f958..ed041ffda 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -150,6 +150,9 @@ class TestAllURLsMatching(unittest.TestCase):
self.assertMatch(
'http://thecolbertreport.cc.com/videos/29w6fx/-realhumanpraise-for-fox-news',
['ComedyCentralShows'])
+ self.assertMatch(
+ 'http://thecolbertreport.cc.com/videos/gh6urb/neil-degrasse-tyson-pt--1?xrs=eml_col_031114',
+ ['ComedyCentralShows'])
if __name__ == '__main__':
unittest.main()
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index cbc212065..ed0c6ea2c 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -45,10 +45,11 @@ class ComedyCentralShowsIE(InfoExtractor):
(?P<clip>
(?:videos/[^/]+/(?P<videotitle>[^/?#]+))
|(the-colbert-report-(videos|collections)/(?P<clipID>[0-9]+)/[^/]*/(?P<cntitle>.*?))
- |(watch/(?P<date>[^/]*)/(?P<tdstitle>.*)))|
+ |(watch/(?P<date>[^/]*)/(?P<tdstitle>.*))
+ )|
(?P<interview>
extended-interviews/(?P<interID>[0-9a-z]+)/(?:playlist_tds_extended_)?(?P<interview_title>.*?)(/.*?)?)))
- $'''
+ (?:[?#].*|$)'''
_TEST = {
'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart',
'md5': '4e2f5cb088a83cd8cdb7756132f9739d',