diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-01-27 22:38:28 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2015-01-27 22:38:28 +0600 |
commit | 3a0d2f520a0f95c2f87b1c95049135b10206f97f (patch) | |
tree | efaa9f6ba5b047f628785b525b723eda718c118c /youtube_dl/YoutubeDL.py | |
parent | 2103d038b3dac6f489d13282dcd2a6f4b74975c3 (diff) |
[YoutubeDL] Temporary fix for subprocess encoding issues on python2 @ Windows (Closes #4787)
For now filenames will be encoded with preferrefencoding before written to disk
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index b5dd77e3f..7f054cdff 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -543,6 +543,11 @@ class YoutubeDL(object): outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL) tmpl = compat_expanduser(outtmpl) filename = tmpl % template_dict + # Temporary fix for #4787 + # 'Treat' all problem characters by passing filename through preferredencoding + # to workaround encoding issues with subprocess on python2 @ Windows + if sys.version_info < (3, 0) and sys.platform == 'win32': + filename = encodeFilename(filename, True).decode(preferredencoding()) return filename except ValueError as err: self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')') |