Browse Source

do not ask the user to report network errors

Filippo Valsorda 12 years ago
parent
commit
d5979c5d55
1 changed files with 5 additions and 2 deletions
  1. 5 2
      youtube_dl/utils.py

+ 5 - 2
youtube_dl/utils.py

@@ -12,7 +12,7 @@ import sys
 import traceback
 import traceback
 import zlib
 import zlib
 import email.utils
 import email.utils
-import json
+import socket
 import datetime
 import datetime
 
 
 try:
 try:
@@ -472,8 +472,11 @@ class ExtractorError(Exception):
     """Error during info extraction."""
     """Error during info extraction."""
     def __init__(self, msg, tb=None):
     def __init__(self, msg, tb=None):
         """ tb, if given, is the original traceback (so that it can be printed out). """
         """ tb, if given, is the original traceback (so that it can be printed out). """
-        msg = msg + u'; please report this issue on GitHub.'
+
+        if not sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
+            msg = msg + u'; please report this issue on GitHub.'
         super(ExtractorError, self).__init__(msg)
         super(ExtractorError, self).__init__(msg)
+
         self.traceback = tb
         self.traceback = tb
         self.exc_info = sys.exc_info()  # preserve original exception
         self.exc_info = sys.exc_info()  # preserve original exception