w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use our own encoding when writing strings

Browse source
This commit is contained in:
Philipp Hagemeister 2014-04-07 21:40:34 +02:00
parent c3855d28b0
commit 104aa7388a
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
youtube_dl/utils.py
View file

@ -917,21 +917,14 @@ def write_string(s, out=None, encoding=None):
if ('b' in getattr(out, 'mode', '') or if ('b' in getattr(out, 'mode', '') or
sys.version_info[0] < 3): # Python 2 lies about mode of sys.stderr sys.version_info[0] < 3): # Python 2 lies about mode of sys.stderr
s = s.encode(encoding or preferredencoding(), 'ignore') byt = s.encode(encoding or preferredencoding(), 'ignore')
try: out.write(byt)
out.write(s) elif hasattr(out, 'buffer'):
except UnicodeEncodeError: enc = encoding or getattr(out, 'encoding', None) or preferredencoding()
# In Windows shells, this can fail even when the codec is just charmap!? byt = s.encode(enc, 'ignore')
# See https://wiki.python.org/moin/PrintFails#Issue out.buffer.write(byt)
if sys.platform == 'win32':
if not encoding and hasattr(out, 'encoding'):
encoding = out.encoding
if encoding:
b = s.encode(encoding, 'ignore').decode(encoding)
out.write(b)
else: else:
raise out.write(s)
out.flush() out.flush()