[yum-commits] repoquery.py

[James Antill]

 repoquery.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 9b47f8e6a66c9fc41b4bc6ea33530eeb8515cfb7
Author: James Antill <james at and.org>
Date:   Fri Feb 27 17:35:02 2009 -0500

    Fix unicode bugs in repoquery changelog, BZ 483157

diff --git a/repoquery.py b/repoquery.py
index 5d030ef..cb5a241 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -35,6 +35,7 @@ import yum.misc as misc
 import yum.config
 import yum.Errors
 import yum.packages
+from yum.i18n import to_unicode
 from rpmUtils.arch import getArchList
 from rpmUtils.miscutils import formatRequire
 import output
@@ -76,10 +77,10 @@ def sec2isodate(timestr):
     return time.strftime("%F %T", time.gmtime(int(timestr)))
 
 def sec2date(timestr):
-    return time.ctime(int(timestr))
+    return to_unicode(time.ctime(int(timestr)))
 
 def sec2day(timestr):
-    return time.strftime("%a %b %d %Y", time.gmtime(int(timestr)))
+    return to_unicode(time.strftime("%a %b %d %Y", time.gmtime(int(timestr))))
 
 def _size2val(size, off, ui):
     size = float(size)
@@ -262,7 +263,9 @@ class repoPkgQuery(pkgQuery):
     def fmt_changelog(self, **kw):
         changelog = []
         for date, author, message in self.pkg.returnChangelog():
-            changelog.append("* %s %s\n%s\n" % (sec2day(date), author, message))
+            changelog.append("* %s %s\n%s\n" % (sec2day(date),
+                                                to_unicode(author),
+                                                to_unicode(message)))
         return "\n".join(changelog)
 
 class instPkgQuery(pkgQuery):
@@ -498,7 +501,7 @@ class YumBaseQuery(yum.YumBase):
         for pkg in pkgs:
             for oper in self.pkgops:
                 try:
-                    print pkg.doQuery(oper)
+                    print to_unicode(pkg.doQuery(oper))
                 except queryError, e:
                     self.logger.error( e.msg)
         for prco in items: