From: Philipp Hagemeister Date: Tue, 27 Nov 2012 20:07:25 +0000 (+0100) Subject: Only encode when output stream is binary X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=c806f804d85dc53f08b1a13d9cfdbe0a8eb58b15;p=youtube-dl Only encode when output stream is binary --- diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 6d52dc923..4e9b55f49 100644 --- 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()