From: Sergey M․ Date: Sat, 19 Dec 2015 23:26:47 +0000 (+0600) Subject: [utils] Add error_to_str X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=fdae2358581be6f80ac5fd20b1062e87a8797f46;p=youtube-dl [utils] Add error_to_str --- diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 5b396ede8..6d3119760 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1806,6 +1806,15 @@ def args_to_str(args): return ' '.join(shlex_quote(a) for a in args) +def error_to_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()) + return err_str + + def mimetype2ext(mt): _, _, res = mt.rpartition('/')