[yum-commits] Branch 'yum-3_2_X' - output.py

[James Antill]

 output.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5ed28957b426248d58b30772110f888e6b2c3a1b
Author: James Antill <james at and.org>
Date:   Tue Oct 27 15:27:03 2009 -0400

    Usernames can contain unicode, so make them unicode. Fixes BZ 531338

diff --git a/output.py b/output.py
index 996b89a..9635473 100755
--- a/output.py
+++ b/output.py
@@ -1207,7 +1207,7 @@ to exit.
             name = _("System") + " " + loginid
             if limit is not None and len(name) > limit:
                 name = loginid
-            return name
+            return to_unicode(name)
 
         try:
             user = pwd.getpwuid(uid)
@@ -1217,9 +1217,9 @@ to exit.
                 name = "%s ... <%s>" % (fullname.split()[0], user.pw_name)
                 if len(name) > limit:
                     name = "<%s>" % user.pw_name
-            return name
+            return to_unicode(name)
         except KeyError:
-            return str(uid)
+            return to_unicode(str(uid))
 
     def _history_list_transactions(self, extcmds):
         tids = set()