فهرست منبع

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

Sergey M․ 8 سال پیش
والد
کامیت
e9137224b3
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      youtube_dl/YoutubeDL.py

+ 2 - 2
youtube_dl/YoutubeDL.py

@@ -370,10 +370,10 @@ class YoutubeDL(object):
                 else:
                 else:
                     raise
                     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
                 sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968'] and
                 not params.get('restrictfilenames', False)):
                 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(
             self.report_warning(
                 'Assuming --restrict-filenames since file system encoding '
                 'Assuming --restrict-filenames since file system encoding '
                 'cannot encode all characters. '
                 'cannot encode all characters. '