From 2f9b8514e4d4b15569ebc88e7da36f5ae972c37e Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 21 Sep 2009 14:15:49 +0000 Subject: Support both Python 2 and 3 in portage._unicode_encode() and portage._unicode_decode(). Update decoding in some files. svn path=/main/trunk/; revision=14321 --- pym/_emerge/EbuildMetadataPhase.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/EbuildMetadataPhase.py') 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): -- cgit v1.2.3-1-g7c22