From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 19 Dec 2015 20:43:50 +0000 (+0600)
Subject: [extractor/common] Properly decode error string on python 2 (Closes #1354, closes... 
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=dd85e4d70787dd0c106fb05bdb0a38f51037fd39;p=youtube-dl

[extractor/common] Properly decode error string on python 2 (Closes #1354, closes #3957, closes #4037, closes #6449)
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 6ab2d68d6..3ab72ff76 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -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: