diff options
| author | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 |
|---|---|---|
| committer | Charles Chen <chaochichen@gmail.com> | 2014-07-22 14:44:38 -0700 |
| commit | c4f731262dbee921147b94aac5035b5d9ec75502 (patch) | |
| tree | 98a93f1de2b7c71a8e25fa072515b4efc5f43ea1 /youtube_dl/extractor/comedycentral.py | |
| parent | 07cc63f386c6afe253b7707631663072d2fb8789 (diff) | |
| parent | e42a692f003eabdb1efad7b9f4b10ce97c712d32 (diff) | |
Merge remote-tracking branch 'upstream/master' into MLB
Conflicts:
youtube_dl/extractor/mlb.py
Diffstat (limited to 'youtube_dl/extractor/comedycentral.py')
| -rw-r--r-- | youtube_dl/extractor/comedycentral.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index 8af0abade..c81ce5a96 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -14,13 +14,13 @@ from ..utils import ( class ComedyCentralIE(MTVServicesInfoExtractor): - _VALID_URL = r'''(?x)https?://(?:www\.)?(comedycentral|cc)\.com/ - (video-clips|episodes|cc-studios|video-collections) + _VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/ + (video-clips|episodes|cc-studios|video-collections|full-episodes) /(?P<title>.*)''' _FEED_URL = 'http://comedycentral.com/feeds/mrss/' _TEST = { - 'url': 'http://www.comedycentral.com/video-clips/kllhuv/stand-up-greg-fitzsimmons--uncensored---too-good-of-a-mother', + 'url': 'http://www.cc.com/video-clips/kllhuv/stand-up-greg-fitzsimmons--uncensored---too-good-of-a-mother', 'md5': 'c4f48e9eda1b16dd10add0744344b6d8', 'info_dict': { 'id': 'cef0cbb3-e776-4bc9-b62e-8016deccb354', |