do not ask the user to report network errors

This commit is contained in:
Filippo Valsorda 2013-06-09 11:55:08 +02:00
parent f5a290eed9
commit d5979c5d55

View File

@ -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). """
if not sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
msg = msg + u'; please report this issue on GitHub.' 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