From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 19 Feb 2009 12:42:42 +0000 (-0000)
Subject: Decode terminal codes from binary when necessary, for python-3.0 compatibility
X-Git-Tag: v2.2_rc24~157
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d951bf3bfa91bd97e177eb6cf08adc688b4f169c;p=portage.git

Decode terminal codes from binary when necessary, for python-3.0 compatibility
since sys.stdout is a text stream.

svn path=/main/trunk/; revision=12649
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e8d634929..a5802bbe5 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9625,6 +9625,9 @@ class JobStatusDisplay(object):
 			for k, capname in self._termcap_name_map.iteritems():
 				term_codes[k] = self._default_term_codes[capname]
 			object.__setattr__(self, "_term_codes", term_codes)
+		for k, v in self._term_codes.items():
+			if not isinstance(v, str):
+				self._term_codes[k] = v.decode()
 
 	def _init_term(self):
 		"""