youtube-dl

commit 9a82b2389fd9b1d893400892d92006d2f9eb17db
parent 8dba13f7e82ecb57b8e92e43ce63d51937a50288
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Tue,  2 Jul 2013 08:40:21 +0200

Do not show bug report for errors that are to be expected (Closes #973)

Diffstat:
M
youtube_dl/extractor/youtube.py
 | 
2
+-
M
youtube_dl/utils.py
 | 
12
++++++++----

2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
@@ -441,7 +441,7 @@ class YoutubeIE(InfoExtractor):
                 break
         if 'token' not in video_info:
             if 'reason' in video_info:
-                raise ExtractorError(u'YouTube said: %s' % video_info['reason'][0])
+                raise ExtractorError(u'YouTube said: %s' % video_info['reason'][0], expected=True)
             else:
                 raise ExtractorError(u'"token" parameter not in video info for unknown reason')
 
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
@@ -470,10 +470,14 @@ def make_HTTPS_handler(opts):
 
 class ExtractorError(Exception):
     """Error during info extraction."""
-    def __init__(self, msg, tb=None):
-        """ tb, if given, is the original traceback (so that it can be printed out). """
-
-        if not sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
+    def __init__(self, msg, tb=None, expected=False):
+        """ tb, if given, is the original traceback (so that it can be printed out).
+        If expected is set, this is a normal error message and most likely not a bug in youtube-dl.
+        """
+
+        if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
+            expected = True
+        if not expected:
             msg = msg + u'; please report this issue on https://yt-dl.org/bug . Be sure to call youtube-dl with the --verbose flag and include its complete output.'
         super(ExtractorError, self).__init__(msg)