[gentoo-commits] portage r12721 - main/trunk/pym/portage/sets

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-02-27 03:08:03 +0000 (Fri, 27 Feb 2009)
New Revision: 12721

Modified:
   main/trunk/pym/portage/sets/shell.py
Log:
Fix CommandOutputSet to decode binary command output in py3k.


Modified: main/trunk/pym/portage/sets/shell.py
===================================================================
--- main/trunk/pym/portage/sets/shell.py	2009-02-27 02:43:45 UTC (rev 12720)
+++ main/trunk/pym/portage/sets/shell.py	2009-02-27 03:08:03 UTC (rev 12721)
@@ -4,6 +4,7 @@
 
 import subprocess
 import os
+import sys
 
 from portage.sets.base import PackageSet
 from portage.sets import SetConfigError
@@ -35,8 +36,11 @@
 		pipe = subprocess.Popen(self._command, stdout=subprocess.PIPE, shell=True)
 		if pipe.wait() == os.EX_OK:
 			text = pipe.stdout.read()
-			self._setAtoms(text.split("\n"))
-		
+			if sys.hexversion >= 0x3000000:
+				encoding = sys.getdefaultencoding()
+				text = text.decode(encoding, 'replace')
+			self._setAtoms(text.splitlines())
+
 	def singleBuilder(self, options, settings, trees):
 		if not "command" in options:
 			raise SetConfigError("no command specified")