]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/common] Properly decode error string on python 2 (Closes #1354, closes...
authorSergey M․ <dstftw@gmail.com>
Sat, 19 Dec 2015 20:43:50 +0000 (02:43 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 19 Dec 2015 20:43:50 +0000 (02:43 +0600)
youtube_dl/extractor/common.py

index 6ab2d68d6f3137ff7a9b4b201102959a7e732e9a..3ab72ff765bddd1d0b7f663106845a56c7572b15 100644 (file)
@@ -34,6 +34,7 @@ from ..utils import (
     fix_xml_ampersands,
     float_or_none,
     int_or_none,
+    preferredencoding,
     RegexNotFoundError,
     sanitize_filename,
     sanitized_Request,
@@ -332,7 +333,12 @@ class InfoExtractor(object):
                 return False
             if errnote is None:
                 errnote = 'Unable to download webpage'
-            errmsg = '%s: %s' % (errnote, compat_str(err))
+            err_str = str(err)
+            # On python 2 error byte string must be decoded with proper
+            # encoding rather than ascii
+            if sys.version_info[0] < 3:
+                err_str = err_str.decode(preferredencoding())
+            errmsg = '%s: %s' % (errnote, err_str)
             if fatal:
                 raise ExtractorError(errmsg, sys.exc_info()[2], cause=err)
             else: