From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 12 Aug 2010 13:51:11 +0000 (-0700)
Subject: Avoid unnecessary sys.hexversion conditional.
X-Git-Tag: v2.2_rc68~258
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fa2eea0844d024ee2a37773666d248e4d6c479b;p=portage.git

Avoid unnecessary sys.hexversion conditional.
---

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 604fbf29d..4444c4e8c 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -1,10 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from portage import os
 from _emerge.AbstractPollTask import AbstractPollTask
 from _emerge.PollConstants import PollConstants
-import sys
 import fcntl
 import array
 
@@ -52,9 +51,7 @@ 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)
+		return b''.join(self._read_data)
 
 	def close(self):
 		"""Free the memory buffer."""