summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-27 02:43:45 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-27 02:43:45 +0000
commit57aaae1ce3f340badc57404b10179836539720e6 (patch)
treecfd69b6cc28c95ec0aef1fa31ae6968f27d30c34 /pym/_emerge/__init__.py
parentLoosen EMakeParallelDisabled.re so it can match more variations. (diff)
downloadportage-multirepo-57aaae1ce3f340badc57404b10179836539720e6.tar.gz
portage-multirepo-57aaae1ce3f340badc57404b10179836539720e6.tar.bz2
portage-multirepo-57aaae1ce3f340badc57404b10179836539720e6.zip
Fix PipeReader and PipeReaderTestCase to work with binary strings in py3k.
svn path=/main/trunk/; revision=12720
Diffstat (limited to 'pym/_emerge/__init__.py')
-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 0dd1070b..83186a91 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1979,6 +1979,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):