diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 07d993b7d..1231b1b11 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -9,6 +9,7 @@ from portage.cache.mappings import slot_dict_class import portage from portage import os from portage import _encodings +from portage import _unicode_decode from portage import _unicode_encode import fcntl import codecs @@ -122,7 +123,7 @@ class EbuildMetadataPhase(SubProcess): def _set_returncode(self, wait_retval): SubProcess._set_returncode(self, wait_retval) if self.returncode == os.EX_OK: - metadata_lines = ''.join(unicode(chunk, + metadata_lines = ''.join(_unicode_decode(chunk, encoding=_encodings['repo.content'], errors='replace') for chunk in self._raw_metadata).splitlines() if len(portage.auxdbkeys) != len(metadata_lines): diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 9a101803f..83b50df63 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -769,7 +769,7 @@ def parse_opts(tmpcmdline, silent=False): if myaction is None and myoptions.deselect is True: myaction = 'deselect' - if myargs and not isinstance(myargs[0], unicode): + if sys.hexversion < 0x3000000 and not isinstance(myargs[0], unicode): for i in range(len(myargs)): myargs[i] = portage._unicode_decode(myargs[i]) |