Decode terminal codes from binary when necessary, for python-3.0 compatibility

since sys.stdout is a text stream. (trunk r12649)

svn path=/main/branches/2.1.6/; revision=12920

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 1e9553fc35c613234e523f3f66b32477976f24cd..f5505d85ab87b6a1cdc4d061728b440886202d7f 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9609,6 +9609,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):
                """