aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/utils.py
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-06-09 11:55:08 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-06-09 11:55:08 +0200
commitd5979c5d55b0df11973b9a2b6630fd676e5726d1 (patch)
treefac9bcb5bdcb484d91105e715f7fd902fc11317b /youtube_dl/utils.py
parentf5a290eed949b7726a8d745960bbe9c6b8b7de52 (diff)
do not ask the user to report network errors
Diffstat (limited to 'youtube_dl/utils.py')
-rw-r--r--youtube_dl/utils.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 718ee3aae..66ae41e31 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -12,7 +12,7 @@ import sys
import traceback
import zlib
import email.utils
-import json
+import socket
import datetime
try:
@@ -472,8 +472,11 @@ 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). """
- 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)
+
self.traceback = tb
self.exc_info = sys.exc_info() # preserve original exception