Merge pull request #1120 from pishposhmcgee/patch-1

[collegehumor] Added an option 'e' to go with 'video' or 'embed'
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-07-25 01:14:43 -07:00
commit 733d9cacb8

View File

@ -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',