From: Philipp Hagemeister Date: Thu, 19 Feb 2015 04:53:09 +0000 (+0100) Subject: [imgur] Simplify X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b88ba05356bdae07245dd5240b36415002e25d0b;p=youtube-dl [imgur] Simplify --- diff --git a/youtube_dl/extractor/imgur.py b/youtube_dl/extractor/imgur.py index 7937a5c81..b16c7aed0 100644 --- a/youtube_dl/extractor/imgur.py +++ b/youtube_dl/extractor/imgur.py @@ -5,12 +5,12 @@ import re from .common import InfoExtractor from ..utils import ( int_or_none, - str_or_none, js_to_json, mimetype2ext, ExtractorError, ) + class ImgurIE(InfoExtractor): _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?P[a-zA-Z0-9]+)(?:\.mp4|\.gifv)?' @@ -43,12 +43,13 @@ class ImgurIE(InfoExtractor): r'(.*?)', - webpage, 'video elements', fatal=False)) + webpage, 'video elements', default=None) if not video_elements: raise ExtractorError( - 'No sources found for video %s' % video_id, expected=True) + 'No sources found for video %s. Maybe an image?' % video_id, + expected=True) formats = [] for m in re.finditer(r'[^"]+)"\s+type="(?P[^"]+)"', video_elements):