commit 18ea0cefc370807e1d31fd7b462691f29f48c8fe
parent 95649b3936e10a48c4a5009eecfb7647756bde39
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 13:10:57 -0800
Merge pull request #560 from phihag/fix-to_screen-mode
to_screen: Only encode when output stream is binary
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
@@ -179,7 +179,7 @@ class FileDownloader(object):
if not self.params.get('quiet', False):
terminator = [u'\n', u''][skip_eol]
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')
self._screen_file.write(output)
self._screen_file.flush()