[yum-git] cli.py output.py

[James Antill]

 cli.py    |    3 ---
 output.py |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 5d1a33afb4665c0e00c2d0db2c873c2f4005f2dc
Author: James Antill <james at and.org>
Date:   Fri Apr 11 17:16:18 2008 -0400

    Revert "Allow searching for unicode, i.e.: ®"
    
    This reverts commit 3ef1cadbdc56950979c8e8034da58f01cb9c2c9d.
    
     Obviously this blows up on other languages, so n/m.

diff --git a/cli.py b/cli.py
index ae66555..f4c044f 100644
--- a/cli.py
+++ b/cli.py
@@ -45,8 +45,6 @@ from yum.rpmtrans import RPMTransaction
 import signal
 import yumcommands
 
-from yum.misc import to_unicode
-
 def sigquit(signum, frame):
     """ SIGQUIT handler for the yum cli. """
     print >> sys.stderr, "Quit signal sent - exiting immediately"
@@ -684,7 +682,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
             
         searchlist = ['name', 'summary', 'description', 'url']
         dups = self.conf.showdupesfromrepos
-        args = map(to_unicode, args)
         matching = self.searchGenerator(searchlist, args,
                                         showdups=dups, keys=True)
         
diff --git a/output.py b/output.py
index 1e3483f..4d835a8 100644
--- a/output.py
+++ b/output.py
@@ -266,7 +266,7 @@ class YumOutput:
         return ret
     
     def fmtSection(self, name, fill='='):
-        name = to_str(name)
+        name = str(name)
         cols = self.term.columns - 2
         name_len = len(name)
         if name_len >= (cols - 4):