diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:13:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:13:02 +0000 |
| commit | ae17dbbbfd775965a19c983bce5820f0e9dca477 (patch) | |
| tree | 7347e0f1bc8a1694f6b62bdd1320a518fc2d9b47 /pym/_emerge/__init__.py | |
| parent | f5437b41e68385b66a867c0d509710ea32915bc3 (diff) | |
| download | portage-ae17dbbbfd775965a19c983bce5820f0e9dca477.tar.gz portage-ae17dbbbfd775965a19c983bce5820f0e9dca477.tar.bz2 portage-ae17dbbbfd775965a19c983bce5820f0e9dca477.zip | |
When decoding term codes inside the JobStatusDisplay constructor, use the
'replace' error handling scheme in order to avoid triggering a potential
UnicodeError. (trunk r12687)
svn path=/main/branches/2.1.6/; revision=12947
Diffstat (limited to 'pym/_emerge/__init__.py')
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 0a910928e..32d07bc7a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -9622,9 +9622,10 @@ 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) + encoding = sys.getdefaultencoding() for k, v in self._term_codes.items(): if not isinstance(v, str): - self._term_codes[k] = v.decode() + self._term_codes[k] = v.decode(encoding, 'replace') def _init_term(self): """ |