Attachment 301835 Details for Bug 441659 – Fix UnicodeEncodeError in yum-cli

[patch] Fix UnicodeEncodeError in yum-cli

fix_unicode_error_yum-cli.patch (text/plain), 3.86 KB, created by HK Kim on 2008-04-09 15:49:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: HK Kim

Created: 2008-04-09 15:49:49 UTC

Size: 3.86 KB

patch

obsolete

>diff -Nau -x '*.py[oc]' /usr/share/yum-cli.org/output.py /usr/share/yum-cli/output.py
>--- /usr/share/yum-cli.org/output.py	2008-04-08 13:38:17.000000000 +0900
>+++ /usr/share/yum-cli/output.py	2008-04-10 00:45:34.000000000 +0900
>@@ -24,6 +24,7 @@
> import gettext
> import rpm
> from yum.i18n import _
>+from yum.misc import to_unicode
> 
> import re # For YumTerm
> 
>@@ -236,7 +237,7 @@
>     def failureReport(self, errobj):
>         """failure output for failovers from urlgrabber"""
>         
>-        self.logger.error('%s: %s', errobj.url, str(errobj.exception))
>+        self.logger.error('%s: %s', errobj.url, to_unicode(errobj.exception))
>         self.logger.error(_('Trying other mirror.'))
>         raise errobj.exception
>     
>@@ -253,7 +254,8 @@
> 
>     def fmtKeyValFill(self, key, val):
>         """ Return a key value pair in the common two column output format. """
>-        val = str(val)
>+        val = to_unicode(val)
>+        key = to_unicode(key)
>         keylen = len(key)
>         cols = self.term.columns
>         nxt = ' ' * (keylen - 2) + ': '
>@@ -266,7 +268,7 @@
>         return ret
>     
>     def fmtSection(self, name, fill='='):
>-        name = str(name)
>+        name = to_unicode(name)
>         cols = self.term.columns - 2
>         name_len = len(name)
>         if name_len >= (cols - 4):
>@@ -523,10 +525,10 @@
>                 repoid = txmbr.repoid
>                 pkgsize = float(txmbr.po.size)
>                 size = self.format_number(pkgsize)
>-                msg = u" %-22s  %-9s  %-15s  %-16s  %5s\n" % (n, a,
>-                              evr, repoid, size)
>+                msg = u" %-22s  %-9s  %-15s  %-16s  %5s\n" % (to_unicode(n), a,
>+                              evr, to_unicode(repoid), size)
>                 for obspo in txmbr.obsoletes:
>-                    appended = _('     replacing  %s.%s %s\n\n') % (obspo.name,
>+                    appended = _('     replacing  %s.%s %s\n\n') % (to_unicode(obspo.name),
>                         obspo.arch, obspo.printVer())
>                     msg = msg+appended
>                 totalmsg = totalmsg + msg
>@@ -745,9 +747,9 @@
>         
>         if self.output and (sys.stdout.isatty() or te_current == te_total):
>             fmt = self._makefmt(percent, ts_current, ts_total)
>-            msg = fmt % (process, pkgname)
>+            msg = fmt % (process, to_unicode(pkgname))
>             if msg != self.lastmsg:
>-                sys.stdout.write(msg)
>+                sys.stdout.write(msg.encode('utf-8'))
>                 sys.stdout.flush()
>                 self.lastmsg = msg
>             if te_current == te_total:
>diff -Nau -x '*.py[oc]' /usr/share/yum-cli.org/yummain.py /usr/share/yum-cli/yummain.py
>--- /usr/share/yum-cli.org/yummain.py	2008-04-08 13:38:17.000000000 +0900
>+++ /usr/share/yum-cli/yummain.py	2008-04-09 22:24:55.000000000 +0900
>@@ -28,6 +28,7 @@
> from yum import plugins
> from yum import logginglevels
> from yum.i18n import _ 
>+from yum.misc import to_unicode
> import cli
> 
> 
>@@ -53,14 +54,14 @@
> 
>         Log the plugin's exit message if one was supplied.
>         '''
>-        exitmsg = str(e)
>+        exitmsg = to_unicode(e)
>         if exitmsg:
>             logger.warn('\n\n%s', exitmsg)
>         if unlock(): return 200
>         return 1
> 
>     def exFatal(e):
>-        logger.critical('\n\n%s', str(e))
>+        logger.critical('\n\n%s', to_unicode(e))
>         if unlock(): return 200
>         return 1
> 
>@@ -113,7 +114,7 @@
>         return exPluginExit(e)
>     except Errors.YumBaseError, e:
>         result = 1
>-        resultmsgs = [str(e)]
>+        resultmsgs = [to_unicode(e)]
>     except KeyboardInterrupt:
>         return exUserCancel()
>     except IOError, e:
>@@ -154,7 +155,7 @@
>         return exPluginExit(e)
>     except Errors.YumBaseError, e:
>         result = 1
>-        resultmsgs = [str(e)]
>+        resultmsgs = [to_unicode(e)]
>     except KeyboardInterrupt:
>         return exUserCancel()
>     except IOError, e:

Actions: View | Diff

Attachments on bug 441659: 301808 | 301809 | 301832 | 301834 | 301835