Replase self._downloader.to_stderr() with self._downloader.trouble()

diff --git a/youtube-dl b/youtube-dl
index cedbf5977667d2100fe27184a222f00908be8f4c..034da35f54e885ed6307c8b51cdeaba3fdf83fae 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -508,7 +508,7 @@ class YoutubeIE(InfoExtractor):
                                else:
                                        raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
                        except (IOError, netrc.NetrcParseError), err:
-                               self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % str(err))
+                               self._downloader.trouble(u'WARNING: parsing .netrc: %s' % str(err))
                                return
 
                # Set language
@@ -517,7 +517,7 @@ class YoutubeIE(InfoExtractor):
                        self.report_lang()
                        urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'WARNING: unable to set language: %s' % str(err))
+                       self._downloader.trouble(u'WARNING: unable to set language: %s' % str(err))
                        return
 
                # No authentication to be performed
@@ -537,10 +537,10 @@ class YoutubeIE(InfoExtractor):
                        self.report_login()
                        login_results = urllib2.urlopen(request).read()
                        if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:
-                               self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
+                               self._downloader.trouble(u'WARNING: unable to log in: bad username or password')
                                return
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'WARNING: unable to log in: %s' % str(err))
+                       self._downloader.trouble(u'WARNING: unable to log in: %s' % str(err))
                        return
        
                # Confirm age
@@ -553,14 +553,14 @@ class YoutubeIE(InfoExtractor):
                        self.report_age_confirmation()
                        age_results = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'ERROR: unable to confirm age: %s' % str(err))
+                       self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
                        return
 
        def _real_extract(self, url):
                # Extract video id from URL
                mobj = re.match(self._VALID_URL, url)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: invalid URL: %s' % url)
+                       self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
                        return [None]
                video_id = mobj.group(2)
 
@@ -586,14 +586,14 @@ class YoutubeIE(InfoExtractor):
                        self.report_webpage_download(video_id)
                        video_webpage = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'ERROR: unable to download video webpage: %s' % str(err))
+                       self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % str(err))
                        return [None]
                self.report_information_extraction(video_id)
                
                # "t" param
                mobj = re.search(r', "t": "([^"]+)"', video_webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract "t" parameter')
+                       self._downloader.trouble(u'ERROR: unable to extract "t" parameter')
                        return [None]
                video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&el=detailpage&ps=' % (video_id, mobj.group(1))
                if format_param is not None:
@@ -603,14 +603,14 @@ class YoutubeIE(InfoExtractor):
                # uploader
                mobj = re.search(r"var watchUsername = '([^']+)';", video_webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract uploader nickname')
+                       self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
                        return [None]
                video_uploader = mobj.group(1)
 
                # title
                mobj = re.search(r'(?im)<title>YouTube - ([^<]*)</title>', video_webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract video title')
+                       self._downloader.trouble(u'ERROR: unable to extract video title')
                        return [None]
                video_title = mobj.group(1).decode('utf-8')
                video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
@@ -668,7 +668,7 @@ class MetacafeIE(InfoExtractor):
                        self.report_disclaimer()
                        disclaimer = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
+                       self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
                        return
 
                # Confirm age
@@ -681,14 +681,14 @@ class MetacafeIE(InfoExtractor):
                        self.report_age_confirmation()
                        disclaimer = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'ERROR: unable to confirm age: %s' % str(err))
+                       self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
                        return
        
        def _real_extract(self, url):
                # Extract id and simplified title from URL
                mobj = re.match(self._VALID_URL, url)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: invalid URL: %s' % url)
+                       self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
                        return [None]
 
                video_id = mobj.group(1)
@@ -707,20 +707,20 @@ class MetacafeIE(InfoExtractor):
                        self.report_download_webpage(video_id)
                        webpage = urllib2.urlopen(request).read()
                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                       self._downloader.to_stderr(u'ERROR: unable retrieve video webpage: %s' % str(err))
+                       self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % str(err))
                        return [None]
 
                # Extract URL, uploader and title from webpage
                self.report_extraction(video_id)
                mobj = re.search(r'(?m)"mediaURL":"(http.*?\.flv)"', webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract media URL')
+                       self._downloader.trouble(u'ERROR: unable to extract media URL')
                        return [None]
                mediaURL = mobj.group(1).replace('\\', '')
 
                mobj = re.search(r'(?m)"gdaKey":"(.*?)"', webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract gdaKey')
+                       self._downloader.trouble(u'ERROR: unable to extract gdaKey')
                        return [None]
                gdaKey = mobj.group(1)
 
@@ -728,13 +728,13 @@ class MetacafeIE(InfoExtractor):
 
                mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract title')
+                       self._downloader.trouble(u'ERROR: unable to extract title')
                        return [None]
                video_title = mobj.group(1).decode('utf-8')
 
                mobj = re.search(r'(?m)<li id="ChnlUsr">.*?Submitter:<br />(.*?)</li>', webpage)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: unable to extract uploader nickname')
+                       self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
                        return [None]
                video_uploader = re.sub(r'<.*?>', '', mobj.group(1))
 
@@ -776,7 +776,7 @@ class YoutubeSearchIE(InfoExtractor):
        def _real_extract(self, query):
                mobj = re.match(self._VALID_QUERY, query)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: invalid search query "%s"' % query)
+                       self._downloader.trouble(u'ERROR: invalid search query "%s"' % query)
                        return [None]
 
                prefix, query = query.split(':')
@@ -789,10 +789,10 @@ class YoutubeSearchIE(InfoExtractor):
                        try:
                                n = int(prefix)
                                if n <= 0:
-                                       self._downloader.to_stderr(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+                                       self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
                                        return [None]
                                elif n > self._max_youtube_results:
-                                       self._downloader.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+                                       self._downloader.trouble(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
                                        n = self._max_youtube_results
                                return self._download_n_results(query, n)
                        except ValueError: # parsing prefix as int fails
@@ -812,7 +812,7 @@ class YoutubeSearchIE(InfoExtractor):
                        try:
                                page = urllib2.urlopen(request).read()
                        except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                               self._downloader.to_stderr(u'ERROR: unable to download webpage: %s' % str(err))
+                               self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
                                return [None]
 
                        # Extract video identifiers
@@ -864,7 +864,7 @@ class YoutubePlaylistIE(InfoExtractor):
                # Extract playlist id
                mobj = re.match(self._VALID_URL, url)
                if mobj is None:
-                       self._downloader.to_stderr(u'ERROR: invalid url: %s' % url)
+                       self._downloader.trouble(u'ERROR: invalid url: %s' % url)
                        return [None]
 
                # Download playlist pages
@@ -878,7 +878,7 @@ class YoutubePlaylistIE(InfoExtractor):
                        try:
                                page = urllib2.urlopen(request).read()
                        except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                               self._downloader.to_stderr(u'ERROR: unable to download webpage: %s' % str(err))
+                               self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
                                return [None]
 
                        # Extract video identifiers