From: Jaime Marquínez Ferrándiz Date: Sun, 5 May 2013 11:59:25 +0000 (+0200) Subject: More callbacks changed to raise ExtractorError X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=486f0c947675eebb129414f8f46010206c9245b7;p=youtube-dl More callbacks changed to raise ExtractorError --- diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index a98d403b3..0f1252113 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -3125,7 +3125,7 @@ class GooglePlusIE(InfoExtractor): pattern = '"(https\://plus\.google\.com/photos/.*?)",,"image/jpeg","video"\]' mobj = re.search(pattern, webpage) if mobj is None: - self._downloader.report_error(u'unable to extract video page URL') + raise ExtractorError(u'Unable to extract video page URL') video_page = mobj.group(1) webpage = self._download_webpage(video_page, video_id, u'Downloading video page') @@ -3137,7 +3137,7 @@ class GooglePlusIE(InfoExtractor): pattern = '\d+,\d+,(\d+),"(http\://redirector\.googlevideo\.com.*?)"' mobj = re.findall(pattern, webpage) if len(mobj) == 0: - self._downloader.report_error(u'unable to extract video links') + raise ExtractorError(u'Unable to extract video links') # Sort in resolution links = sorted(mobj) @@ -3343,14 +3343,14 @@ class FunnyOrDieIE(InfoExtractor): m = re.search(r']*>\s*]*>\s*(?P.*?)</h1>", webpage, flags=re.DOTALL) if not m: m = re.search(r'<title>(?P<title>[^<]+?)', webpage) if not m: - self._downloader.report_error(u'Cannot find video title') + raise ExtractorError(u'Cannot find video title') title = clean_html(m.group('title')) m = re.search(r'