mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-12 08:39:29 -04:00
Merge pull request #560 from phihag/fix-to_screen-mode
to_screen: Only encode when output stream is binary
This commit is contained in:
commit
18ea0cefc3
@ -179,7 +179,7 @@ class FileDownloader(object):
|
|||||||
if not self.params.get('quiet', False):
|
if not self.params.get('quiet', False):
|
||||||
terminator = [u'\n', u''][skip_eol]
|
terminator = [u'\n', u''][skip_eol]
|
||||||
output = message + terminator
|
output = message + terminator
|
||||||
if 'b' not in self._screen_file.mode or sys.version_info[0] < 3: # Python 2 lies about the mode of sys.stdout/sys.stderr
|
if 'b' in getattr(self._screen_file, 'mode', '') or sys.version_info[0] < 3: # Python 2 lies about the mode of sys.stdout/sys.stderr
|
||||||
output = output.encode(preferredencoding(), 'ignore')
|
output = output.encode(preferredencoding(), 'ignore')
|
||||||
self._screen_file.write(output)
|
self._screen_file.write(output)
|
||||||
self._screen_file.flush()
|
self._screen_file.flush()
|
||||||
|
Loading…
Reference in New Issue
Block a user