Only encode when output stream is binary

This commit is contained in:
Philipp Hagemeister 2012-11-27 21:07:25 +01:00
parent 95649b3936
commit c806f804d8

View file

@ -179,7 +179,7 @@ def to_screen(self, message, skip_eol=False):
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()