[yum-git] yum/__init__.py yum/misc.py

[Tim Lauridsen]

 yum/__init__.py |    4 ++--
 yum/misc.py     |    7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9158b39c16d9dcd2dccdbd6e58542f7cea218d6d
Author: Tim Lauridsen <tla at rasmil.dk>
Date:   Tue Mar 25 12:42:50 2008 +0100

    Added a generic unicode converter func to misc, and use it on rpm po in search generator (rhbz #438633)

diff --git a/yum/__init__.py b/yum/__init__.py
index 3974098..6e855d4 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -63,6 +63,7 @@ from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumIns
 from constants import *
 from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
 from yum.i18n import _
+from misc import to_unicode
 
 import string
 
@@ -1497,8 +1498,7 @@ class YumBase(depsolve.Depsolve):
                 for field in fields:
                     value = getattr(po, field)
                     # make sure that string are in unicode
-                    if isinstance(value, str):
-                        value = unicode(value,'unicode-escape')
+                    value = to_unicode(value)
                     if value and value.lower().find(s) != -1:
                         if not matched_s:
                             criteria_matched += 1
diff --git a/yum/misc.py b/yum/misc.py
index 2172af9..9447f90 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -510,4 +510,11 @@ def find_ts_remaining(timestamp, yumlibpath='/var/lib/yum'):
     
     return to_complete_items
     
+def to_unicode(obj, encoding='utf-8'):
+    ''' convert a 'str' to 'unicode' '''
+    if isinstance(obj, basestring):
+        if not isinstance(obj, unicode):
+            obj = unicode(obj, encoding)
+    return obj
+