summaryrefslogtreecommitdiffstats
path: root/pym/_emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 06:23:46 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 06:23:46 +0000
commit290d16343024beec673664ffb04e20ac106dd43d (patch)
tree5fe3dd49440c9b21b3cad2477f5e93723799d6b4 /pym/_emerge
parentcf414f026df3aa2baa5fe277b05136770309dd76 (diff)
downloadportage-290d16343024beec673664ffb04e20ac106dd43d.tar.gz
portage-290d16343024beec673664ffb04e20ac106dd43d.tar.bz2
portage-290d16343024beec673664ffb04e20ac106dd43d.zip
Fix PipeReader and PipeReaderTestCase to work with binary strings in py3k.
(trunk r12720) svn path=/main/branches/2.1.6/; revision=12975
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a6332b4f6..43ed4196d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1960,6 +1960,8 @@ class PipeReader(AbstractPollTask):
def getvalue(self):
"""Retrieve the entire contents"""
+ if sys.hexversion >= 0x3000000:
+ return bytes().join(self._read_data)
return "".join(self._read_data)
def close(self):