diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-05-09 01:14:02 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-05-09 01:14:02 +0700 |
| commit | e9137224b3ef638cce3dac024814397fd020f3b9 (patch) | |
| tree | 04e4b4290609b4c28ec7c96f22bf88416ddc477c | |
| parent | 804181dda9cbb7f2cbb8305bb4097908312a83f6 (diff) | |
| download | youtube-dl-e9137224b3ef638cce3dac024814397fd020f3b9.tar.gz youtube-dl-e9137224b3ef638cce3dac024814397fd020f3b9.tar.xz youtube-dl-e9137224b3ef638cce3dac024814397fd020f3b9.zip | |
[YoutubeDL] Force restrict filenames when no locale is set for python 2 as well (#13027)
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 4 |
1 files changed, 2 insertions, 2 deletions
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. ' |