Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Workaround for regex engine limitation" 

This reverts commit 6d0d573eca.
pull/2700/head
AGSPhoenix 2014-04-04 15:37:49 -04:00
parent 6d0d573eca
commit fa387d2d99
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/teamcoco.py
View File

@ -9,7 +9,7 @@ from ..utils import (
class TeamcocoIE(InfoExtractor): 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 = [ _TESTS = [
{ {
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant', '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) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
raise ExtractorError('Invalid URL: %s' % url) raise ExtractorError('Invalid URL: %s' % url)
url_title = mobj.group(2) url_title = mobj.group('url_title')
if url_title == '':
url_title = mobj.group(1)
webpage = self._download_webpage(url, url_title) webpage = self._download_webpage(url, url_title)
video_id = mobj.group(1) video_id = mobj.group("video_id")
if mobj.group(2) == '': if video_id == '':
video_id = self._html_search_regex( video_id = self._html_search_regex(
r'<article class="video" data-id="(\d+?)"', r'<article class="video" data-id="(\d+?)"',
webpage, 'video id') webpage, 'video id')