From: Sergey M․ Date: Tue, 23 Jun 2015 21:08:24 +0000 (+0600) Subject: [extractor/generic] Clarify generic extraction warning X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2fece970b80022574a6b54c936820897cfd10d70;p=youtube-dl [extractor/generic] Clarify generic extraction warning --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 3d672197c..c8582bda9 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -977,10 +977,10 @@ class GenericIE(InfoExtractor): 'upload_date': upload_date, } - if (not self._downloader.params.get('test', False) and - not is_intentional and - not self._downloader.params.get('force_generic_extractor', False)): - self._downloader.report_warning('Falling back on generic information extractor.') + if not self._downloader.params.get('test', False) and not is_intentional: + force = self._downloader.params.get('force_generic_extractor', False) + self._downloader.report_warning( + '%s on generic information extractor.' % ('Forcing' if force else 'Falling back')) if not full_response: request = compat_urllib_request.Request(url)