debian/rules: Move incorrectly installed file to its right place.

[youtubedl] / youtube_dl / utils.py

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 63d9d0ae58dd36fafa835fe29b1d07332b5fabbc..66ae41e319e39d7c75597a31034315f996f00797 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -12,7 +12,7 @@ import sys
 import traceback
 import zlib
 import email.utils
 import traceback
 import zlib
 import email.utils

-import json
+import socket

 import datetime
 
 try:
 import datetime
 
 try:


@@ -154,6 +154,9 @@ def compat_ord(c):
     if type(c) is int: return c
     else: return ord(c)
 
     if type(c) is int: return c
     else: return ord(c)
 

+# This is not clearly defined otherwise
+compiled_regex_type = type(re.compile(''))
+

 std_headers = {
     'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20100101 Firefox/10.0',
     'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
 std_headers = {
     'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20100101 Firefox/10.0',
     'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',


@@ -469,7 +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). """
     """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):
+            msg = msg + u'; please report this issue on GitHub.'

         super(ExtractorError, self).__init__(msg)
         super(ExtractorError, self).__init__(msg)

+

         self.traceback = tb
         self.exc_info = sys.exc_info()  # preserve original exception
 
         self.traceback = tb
         self.exc_info = sys.exc_info()  # preserve original exception