Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-27 19:12:40 +01:00
Code Issues Projects Releases Wiki Activity

Simplify print_ changes (#2094)

Browse source
This commit is contained in:
Adrian Sampson 2016-06-29 10:12:38 -07:00
parent dc0fff0ca0
commit 4ae7448c25
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
beets/ui/__init__.py
View file

@ -135,7 +135,8 @@ def print_(*strings, **kwargs):
is not in the terminal's encoding's character set, just silently
replaces it.
The arguments must be unicode strings
The arguments must be Unicode strings: `unicode` on Python 2; `str` on
Python 3.
The `end` keyword argument behaves similarly to the built-in `print`
(it defaults to a newline). The value should have the same string
@ -143,17 +144,14 @@ def print_(*strings, **kwargs):
"""
if not strings:
strings = [u'']
end = kwargs.get('end')
assert isinstance(strings[0], six.text_type)
txt = u' '.join(strings)
txt += u'\n' if end is None else end
txt += kwargs.get('end', u'\n')
# Always send bytes to the stdout stream on python 2.
# Send bytes to the stdout stream on Python 2.
if six.PY2:
if isinstance(txt, six.text_type):
txt = txt.encode(_out_encoding(), 'replace')
txt = txt.encode(_out_encoding(), 'replace')
sys.stdout.write(txt)