From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sun, 9 Jun 2013 09:55:08 +0000 (+0200)
Subject: do not ask the user to report network errors
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=d5979c5d55b0df11973b9a2b6630fd676e5726d1;p=youtube-dl

do not ask the user to report network errors
---

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