From 8eab4a8bca97d338fc141278b46d89d3e5a54360 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 20 Sep 2009 20:00:57 +0000 Subject: Use _unicode_encode() to ensure that only unicode strings are passed into io.StringIO text streams. svn path=/main/trunk/; revision=14301 --- pym/_emerge/JobStatusDisplay.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index dd72a2971..7cf3607fb 100644 --- a/pym/_emerge/JobStatusDisplay.py +++ b/pym/_emerge/JobStatusDisplay.py @@ -10,6 +10,7 @@ from io import StringIO import portage from portage import os from portage import _encodings +from portage import _unicode_decode from portage.output import xtermTitle from _emerge.getloadavg import getloadavg @@ -222,36 +223,36 @@ class JobStatusDisplay(object): f = formatter.AbstractFormatter(style_writer) number_style = "INFORM" - f.add_literal_data("Jobs: ") + f.add_literal_data(_unicode_decode("Jobs: ")) f.push_style(number_style) - f.add_literal_data(curval_str) + f.add_literal_data(_unicode_decode(curval_str)) f.pop_style() - f.add_literal_data(" of ") + f.add_literal_data(_unicode_decode(" of ")) f.push_style(number_style) - f.add_literal_data(maxval_str) + f.add_literal_data(_unicode_decode(maxval_str)) f.pop_style() - f.add_literal_data(" complete") + f.add_literal_data(_unicode_decode(" complete")) if self.running: - f.add_literal_data(", ") + f.add_literal_data(_unicode_decode(", ")) f.push_style(number_style) - f.add_literal_data(running_str) + f.add_literal_data(_unicode_decode(running_str)) f.pop_style() - f.add_literal_data(" running") + f.add_literal_data(_unicode_decode(" running")) if self.failed: - f.add_literal_data(", ") + f.add_literal_data(_unicode_decode(", ")) f.push_style(number_style) - f.add_literal_data(failed_str) + f.add_literal_data(_unicode_decode(failed_str)) f.pop_style() - f.add_literal_data(" failed") + f.add_literal_data(_unicode_decode(" failed")) padding = self._jobs_column_width - len(plain_output.getvalue()) if padding > 0: - f.add_literal_data(padding * " ") + f.add_literal_data(padding * _unicode_decode(" ")) - f.add_literal_data("Load avg: ") - f.add_literal_data(load_avg_str) + f.add_literal_data(_unicode_decode("Load avg: ")) + f.add_literal_data(_unicode_decode(load_avg_str)) # Truncate to fit width, to avoid making the terminal scroll if the # line overflows (happens when the load average is large). -- cgit v1.2.3-1-g7c22