From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 22 Aug 2009 19:28:35 +0000 (-0000)
Subject: Bug #282269, comment #2 - Avoid potential UnicodeEncodeError when writing
X-Git-Tag: v2.2_rc40~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0df6293a40d0c021594b8edb613e683c5e18d359;p=portage.git

Bug #282269, comment #2 - Avoid potential UnicodeEncodeError when writing
to sys.stderr inside xtermTitle().

svn path=/main/trunk/; revision=14126
---

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 0e016c5c6..637535b0b 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -252,6 +252,9 @@ def xtermTitle(mystr, raw=False):
 			mystr = mystr[:_max_xtermTitle_len]
 		if not raw:
 			mystr = '\x1b]0;%s\x07' % mystr
+		if sys.hexversion < 0x3000000 and isinstance(mystr, unicode):
+			# avoid potential UnicodeEncodeError
+			mystr = mystr.encode(_encodings['stdio'], 'backslashreplace')
 		sys.stderr.write(mystr)
 		sys.stderr.flush()