From: Philipp Hagemeister Date: Mon, 7 Apr 2014 13:24:12 +0000 (+0200) Subject: [teamcoco] Simplify ID management (Closes #2715) X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=dfb2cb5cfdf7ec58e64ae2a4fe0d96dce242465c;p=youtube-dl [teamcoco] Simplify ID management (Closes #2715) --- diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index c86f1e423..dcdadd120 100644 --- a/youtube_dl/extractor/teamcoco.py +++ b/youtube_dl/extractor/teamcoco.py @@ -9,7 +9,7 @@ from ..utils import ( class TeamcocoIE(InfoExtractor): - _VALID_URL = r'http://teamcoco\.com/video/(?P[0-9]+)?/?(?P.*)' + _VALID_URL = r'http://teamcoco\.com/video/(?P[0-9]+)?/?(?P.*)' _TESTS = [ { 'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant', @@ -33,21 +33,19 @@ class TeamcocoIE(InfoExtractor): def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - if mobj is None: - raise ExtractorError('Invalid URL: %s' % url) - url_title = mobj.group('url_title') - webpage = self._download_webpage(url, url_title) + + display_id = mobj.group('display_id') + webpage = self._download_webpage(url, display_id) video_id = mobj.group("video_id") - if video_id == '': + if not video_id: video_id = self._html_search_regex( r'