| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-04 18:09:46 +0000 (Tue, 04 Aug 2009) |
| 3 |
New Revision: 13900 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/util.py |
| 7 |
Log: |
| 8 |
Avoid UnicodeEncodeError in writemsg(). Thanks to Markos Chandras |
| 9 |
<hwoarang@g.o> for reporting. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/util.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/util.py 2009-08-04 17:00:19 UTC (rev 13899) |
| 15 |
+++ main/trunk/pym/portage/util.py 2009-08-04 18:09:46 UTC (rev 13900) |
| 16 |
@@ -56,6 +56,9 @@ |
| 17 |
if fd is None: |
| 18 |
fd = sys.stderr |
| 19 |
if noiselevel <= noiselimit: |
| 20 |
+ if sys.hexversion < 0x3000000 and isinstance(mystr, unicode): |
| 21 |
+ # avoid potential UnicodeEncodeError |
| 22 |
+ mystr = mystr.encode('utf_8', 'replace') |
| 23 |
fd.write(mystr) |
| 24 |
fd.flush() |
Archives