projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
804181d
)
[YoutubeDL] Force restrict filenames when no locale is set for python 2 as well ...
author
Sergey M․
<dstftw@gmail.com>
Mon, 8 May 2017 18:14:02 +0000
(
01:14
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 8 May 2017 18:14:02 +0000
(
01:14
+0700)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index eb465c425a36c070deac3e702ba4592f051752d6..4c33d494a36361b8f1faf6b5a65eaea11aef0101 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-370,10
+370,10
@@
class YoutubeDL(object):
else:
raise
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)):
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. '
self.report_warning(
'Assuming --restrict-filenames since file system encoding '
'cannot encode all characters. '