youtube-dl

commit e9137224b3ef638cce3dac024814397fd020f3b9
parent 804181dda9cbb7f2cbb8305bb4097908312a83f6
Author: Sergey M․ <dstftw@gmail.com>
Date:   Tue,  9 May 2017 01:14:02 +0700

[YoutubeDL] Force restrict filenames when no locale is set for python 2 as well (#13027)

Diffstat:
M
youtube_dl/YoutubeDL.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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. '