diff options
| author | AGSPhoenix <lx45803@gmail.com> | 2014-04-04 15:37:49 -0400 |
|---|---|---|
| committer | AGSPhoenix <lx45803@gmail.com> | 2014-04-04 15:37:49 -0400 |
| commit | fa387d2d99b837d827a9a8b8996d245dd3d191c4 (patch) | |
| tree | d24d0448c133f7a0098c72f9baf1565d726d7c34 /youtube_dl/extractor/teamcoco.py | |
| parent | 6d0d573ecaf763ce2b043ef7f83a743170eab16d (diff) | |
| download | youtube-dl-fa387d2d99b837d827a9a8b8996d245dd3d191c4.zip youtube-dl-fa387d2d99b837d827a9a8b8996d245dd3d191c4.tar.gz youtube-dl-fa387d2d99b837d827a9a8b8996d245dd3d191c4.tar.bz2 | |
Revert "Workaround for regex engine limitation"
This reverts commit 6d0d573ecaf763ce2b043ef7f83a743170eab16d.
Diffstat (limited to 'youtube_dl/extractor/teamcoco.py')
| -rw-r--r-- | youtube_dl/extractor/teamcoco.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index 66c9bd7..fdaf62c 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/([^/]*)?/?(.*)' + _VALID_URL = r'http://teamcoco\.com/video/(?P<video_id>\d*)?/?(?P<url_title>.*)' _TESTS = [ { 'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant', @@ -35,13 +35,11 @@ class TeamcocoIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) if mobj is None: raise ExtractorError('Invalid URL: %s' % url) - url_title = mobj.group(2) - if url_title == '': - url_title = mobj.group(1) + url_title = mobj.group('url_title') webpage = self._download_webpage(url, url_title) - video_id = mobj.group(1) - if mobj.group(2) == '': + video_id = mobj.group("video_id") + if video_id == '': video_id = self._html_search_regex( r'<article class="video" data-id="(\d+?)"', webpage, 'video id') |