summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-04-24 22:11:57 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-04-24 22:11:57 +0200
commit0d173446ff5edacdfa9419dcb6a7f44aaad09a5b (patch)
tree88520982203773745672eb436e00b60ee15a8efc
parent320e26a0af46dcefd53ba06656c986def933bc6b (diff)
downloadyoutube-dl-0d173446ff5edacdfa9419dcb6a7f44aaad09a5b.tar.gz
youtube-dl-0d173446ff5edacdfa9419dcb6a7f44aaad09a5b.tar.xz
youtube-dl-0d173446ff5edacdfa9419dcb6a7f44aaad09a5b.zip
InfoExtractors: use report_download_webpage in _request_webpage
Allows to show the warning when falling back on GenericIE
-rwxr-xr-xyoutube_dl/InfoExtractors.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index d71e1a90e..f5e29af94 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -114,8 +114,8 @@ class InfoExtractor(object):
     def _request_webpage(self, url_or_request, video_id, note=None, errnote=None):
         """ Returns the response handle """
         if note is None:
-            note = u'Downloading video webpage'
-        if note is not False:
+            self.report_download_webpage(video_id)
+        elif note is not False:
             self.to_screen(u'%s: %s' % (video_id, note))
         try:
             return compat_urllib_request.urlopen(url_or_request)
@@ -1318,7 +1318,7 @@ class GenericIE(InfoExtractor):
         """Report webpage download."""
         if not self._downloader.params.get('test', False):
             self._downloader.report_warning(u'Falling back on generic information extractor.')
-        self.to_screen(u'%s: Downloading webpage' % video_id)
+        super(GenericIE, self).report_download_webpage(video_id)
 
     def report_following_redirect(self, new_url):
         """Report information extraction."""