[kupfer] plugin.apt_tools: Use kupferstring.fromlocale



commit d93c925c309dd328bf21aa0ecd108e5483df519f
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Oct 27 00:31:15 2009 +0100

    plugin.apt_tools: Use kupferstring.fromlocale
    
    We need to decode command-line output according to the locale.
    
    Tested with aptitude with locales:
    * LANG=sv_SE.ISO-8859-1
    * LANG=sv_SE.UTF-8

 kupfer/plugin/apt_tools.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/kupfer/plugin/apt_tools.py b/kupfer/plugin/apt_tools.py
index 54b7b15..93ff565 100644
--- a/kupfer/plugin/apt_tools.py
+++ b/kupfer/plugin/apt_tools.py
@@ -5,8 +5,7 @@ import gtk
 
 from kupfer.objects import Action
 from kupfer.objects import TextLeaf
-from kupfer import task, uiutils
-
+from kupfer import kupferstring, task, uiutils
 
 __kupfer_name__ = _("APT Package Tools")
 __kupfer_sources__ = ()
@@ -17,7 +16,6 @@ __version__ = ""
 __author__ = ("VCoolio <martinkoelewijn gmail com>, "
               "Ulrik Sverdrup <ulrik sverdrup gmail com>")
 
-
 class InfoTask(task.ThreadTask):
 	def __init__(self, text):
 		super(InfoTask, self).__init__()
@@ -30,7 +28,9 @@ class InfoTask(task.ThreadTask):
 				stdout=P, stderr=P)
 		apt_out, apt_err = apt.communicate()
 		acp_out, acp_err = acp.communicate()
-		self.info = "%s%s%s\n\n%s" % (apt_err, acp_err, apt_out, acp_out)
+		# Commandline output is encoded according to locale
+		self.info = u"".join(kupferstring.fromlocale(s)
+				for s in (apt_err, acp_err, apt_out, acp_out))
 	def thread_finish(self):
 		uiutils.show_text_result(self.info, title=_("Show Package Information"))
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]