| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-22 19:28:35 +0000 (Sat, 22 Aug 2009) |
| 3 |
New Revision: 14126 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/output.py |
| 7 |
Log: |
| 8 |
Bug #282269, comment #2 - Avoid potential UnicodeEncodeError when writing |
| 9 |
to sys.stderr inside xtermTitle(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/output.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/output.py 2009-08-22 19:05:32 UTC (rev 14125) |
| 15 |
+++ main/trunk/pym/portage/output.py 2009-08-22 19:28:35 UTC (rev 14126) |
| 16 |
@@ -252,6 +252,9 @@ |
| 17 |
mystr = mystr[:_max_xtermTitle_len] |
| 18 |
if not raw: |
| 19 |
mystr = '\x1b]0;%s\x07' % mystr |
| 20 |
+ if sys.hexversion < 0x3000000 and isinstance(mystr, unicode): |
| 21 |
+ # avoid potential UnicodeEncodeError |
| 22 |
+ mystr = mystr.encode(_encodings['stdio'], 'backslashreplace') |
| 23 |
sys.stderr.write(mystr) |
| 24 |
sys.stderr.flush() |
Archives