diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-20 20:00:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-20 20:00:57 +0000 |
| commit | 8eab4a8bca97d338fc141278b46d89d3e5a54360 (patch) | |
| tree | fea8ac391bda18d8be39eefafef9416f4fab1e53 /pym/portage/output.py | |
| parent | efb3c3c3b578d851539e12ec21da7ea5bf8a6dc2 (diff) | |
| download | portage-8eab4a8bca97d338fc141278b46d89d3e5a54360.tar.gz portage-8eab4a8bca97d338fc141278b46d89d3e5a54360.tar.bz2 portage-8eab4a8bca97d338fc141278b46d89d3e5a54360.zip | |
Use _unicode_encode() to ensure that only unicode strings are passed into
io.StringIO text streams.
svn path=/main/trunk/; revision=14301
Diffstat (limited to 'pym/portage/output.py')
| -rw-r--r-- | pym/portage/output.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/output.py b/pym/portage/output.py index 5170d70aa..a85647c4d 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -22,6 +22,7 @@ portage.proxy.lazyimport.lazyimport(globals(), from portage import os from portage import _encodings from portage import _unicode_encode +from portage import _unicode_decode from portage.const import COLOR_MAP_FILE from portage.exception import CommandNotFound, FileNotFound, \ ParseError, PermissionDenied, PortageException @@ -743,6 +744,12 @@ def _init(config_root='/'): codes = object.__getattribute__(codes, '_attr') _styles = object.__getattribute__(_styles, '_attr') + for k, v in codes.iteritems(): + codes[k] = _unicode_decode(v) + + for k, v in _styles.iteritems(): + _styles[k] = _unicode_decode(v) + try: _parse_color_map(config_root=config_root, onerror=lambda e: writemsg("%s\n" % str(e), noiselevel=-1)) |