X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftinypic.py;h=4fe89dbe516f8e25eb1f84239bc9cbc9f26bd648;hb=9e1a5b845586a0a5431fb72467142046d8571e6f;hp=2246d27b2f741047eb6b53ad0e4f54e79293294b;hpb=b5dbe89bbacf9c257c1c44d857232bfae11901a0;p=youtube-dl diff --git a/youtube_dl/extractor/tinypic.py b/youtube_dl/extractor/tinypic.py index 2246d27b2..4fe89dbe5 100644 --- a/youtube_dl/extractor/tinypic.py +++ b/youtube_dl/extractor/tinypic.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from youtube_dl.utils import ExtractorError +from ..utils import ExtractorError class TinyPicIE(InfoExtractor): @@ -26,9 +26,9 @@ class TinyPicIE(InfoExtractor): video_id = mobj.group('id') webpage = self._download_webpage(url, video_id, 'Downloading page') - + mobj = re.search(r'(?m)fo\.addVariable\("file",\s"(?P[\da-z]+)"\);\n' - '\s+fo\.addVariable\("s",\s"(?P\d+)"\);', webpage) + '\s+fo\.addVariable\("s",\s"(?P\d+)"\);', webpage) if mobj is None: raise ExtractorError('Video %s does not exist' % video_id, expected=True) @@ -47,4 +47,4 @@ class TinyPicIE(InfoExtractor): 'url': video_url, 'thumbnail': thumbnail, 'title': title - } \ No newline at end of file + }