summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <[email protected]>2013-07-25 01:14:43 -0700
committerJaime Marquínez Ferrándiz <[email protected]>2013-07-25 01:14:43 -0700
commit733d9cacb859f3d3571ab68607d46c722454a32c (patch)
tree34f3b64a88d137836fa30c688b3f396e4ac5fb0e
parent42f2805e48b918a74319aeaca9f8b9068e6e0298 (diff)
parente93aa81aa60fc9b44e10feba565586e82e56ba18 (diff)
downloadyoutube-dl-733d9cacb859f3d3571ab68607d46c722454a32c.tar.gz
youtube-dl-733d9cacb859f3d3571ab68607d46c722454a32c.zip
Merge pull request #1120 from pishposhmcgee/patch-1
[collegehumor] Added an option 'e' to go with 'video' or 'embed'
-rw-r--r--youtube_dl/extractor/collegehumor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/collegehumor.py b/youtube_dl/extractor/collegehumor.py
index 4a0b0af5a..5badde03a 100644
--- a/youtube_dl/extractor/collegehumor.py
+++ b/youtube_dl/extractor/collegehumor.py
@@ -10,7 +10,7 @@ from ..utils import (
class CollegeHumorIE(InfoExtractor):
- _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed)/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$'
+ _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed|e)/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$'
_TEST = {
u'url': u'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',