diff options
author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-08-11 19:09:18 +0800 |
---|---|---|
committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-08-11 19:09:18 +0800 |
commit | e2e84aed7e75a4e073dca934b7ff85e29399b23a (patch) | |
tree | aa0d7c4e22db70d925e57f895a62943f83a2afeb | |
parent | 7f2ed4759513b153e526cd890fd5b8877f56f1c2 (diff) | |
parent | b1927f4e8a07a7893392135a71fdb6818295bbad (diff) |
Merge branch 'lkho-pr/#10268'
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 193f8db9f..e844dc98a 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1603,7 +1603,9 @@ class YoutubeDL(object): self.to_screen('[info] Video subtitle %s.%s is already_present' % (sub_lang, sub_format)) else: self.to_screen('[info] Writing video subtitles to: ' + sub_filename) - with io.open(encodeFilename(sub_filename), 'w', encoding='utf-8') as subfile: + # Use newline='' to prevent conversion of newline characters + # See https://github.com/rg3/youtube-dl/issues/10268 + with io.open(encodeFilename(sub_filename), 'w', encoding='utf-8', newline='') as subfile: subfile.write(sub_data) except (OSError, IOError): self.report_error('Cannot write subtitles file ' + sub_filename) |