From: Sergey M․ Date: Mon, 8 May 2017 18:14:02 +0000 (+0700) Subject: [YoutubeDL] Force restrict filenames when no locale is set for python 2 as well ... X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e9137224b3ef638cce3dac024814397fd020f3b9;p=youtube-dl [YoutubeDL] Force restrict filenames when no locale is set for python 2 as well (#13027) --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index eb465c425..4c33d494a 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -370,10 +370,10 @@ class YoutubeDL(object): else: raise - if (sys.version_info >= (3,) and sys.platform != 'win32' and + if (sys.platform != 'win32' and sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968'] and not params.get('restrictfilenames', False)): - # On Python 3, the Unicode filesystem API will throw errors (#1474) + # Unicode filesystem API will throw errors (#1474, #13027) self.report_warning( 'Assuming --restrict-filenames since file system encoding ' 'cannot encode all characters. '