Merge tag 'upstream/2014.01.17.2'

[youtubedl] / youtube_dl / extractor / comedycentral.py

diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 53579aa2703e78150c14dfe5dfd35e6240310952..27bd8256e6bf6dfb8dc7ae7997a29c2162d863d2 100644 (file)
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -12,7 +12,9 @@ from ..utils import (
 
 
 class ComedyCentralIE(MTVServicesInfoExtractor):
 
 
 class ComedyCentralIE(MTVServicesInfoExtractor):

-    _VALID_URL = r'http://www.comedycentral.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
+    _VALID_URL = r'''(?x)https?://(?:www.)?comedycentral.com/
+        (video-clips|episodes|cc-studios|video-collections)
+        /(?P<title>.*)'''

     _FEED_URL = u'http://comedycentral.com/feeds/mrss/'
 
     _TEST = {
     _FEED_URL = u'http://comedycentral.com/feeds/mrss/'
 
     _TEST = {