Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-03-06 13:12:00 +01:00
Code Issues Projects Releases Wiki Activity

On Python 3 in tests, record str output directly

Browse source 
This is a little ugly. Eventually, it would be nice to create a single output
stream set up with the appropriate encoding settings *at startup* and use that
repeatedly, instead of having `print_` check the settings every time. This
output stream could be cleanly replaced with a mock harness for testing.

Yet another reason to desire a big "beets context" object...
This commit is contained in:
Adrian Sampson 2017-01-19 11:42:46 -08:00
parent 5233e0fcdd
commit a99d5d2ed2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
beets/ui/__init__.py
View file

@ -136,16 +136,22 @@ def print_(*strings, **kwargs):
txt += kwargs.get('end', u'\n')
# Encode the string and write it to stdout.
txt = txt.encode(_out_encoding(), 'replace')
if six.PY2:
# On Python 2, sys.stdout expects bytes.
sys.stdout.write(txt)
out = txt.encode(_out_encoding(), 'replace')
sys.stdout.write(out)
else:
# On Python 3, sys.stdout expects text strings and uses the
# exception-throwing encoding error policy. To avoid throwing
# errors and use our configurable encoding override, we use the
# underlying bytes buffer instead.
sys.stdout.buffer.write(txt)
if hasattr(sys.stdout, 'buffer'):
out = txt.encode(_out_encoding(), 'replace')
sys.stdout.buffer.write(out)
else:
# In our test harnesses (e.g., DummyOut), sys.stdout.buffer
# does not exist. We instead just record the text string.
sys.stdout.write(txt)
# Configuration wrappers.