[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Zac Medico]

commit:     6b9a29652474f1139dc088322cf68f22f37e5fed
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 02:34:08 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 02:34:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6b9a2965

PipeReader: use os.read/write

---
 pym/_emerge/PipeReader.py |   30 +++++++++++-------------------
 1 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 888c609..67144c3 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -4,8 +4,8 @@
 from portage import os
 from _emerge.AbstractPollTask import AbstractPollTask
 from _emerge.PollConstants import PollConstants
+import errno
 import fcntl
-import array
 
 class PipeReader(AbstractPollTask):
 
@@ -59,26 +59,18 @@ class PipeReader(AbstractPollTask):
 
 		if event & PollConstants.POLLIN:
 
-			for f in self.input_files.values():
-				if fd == f.fileno():
-					break
-
-			buf = array.array('B')
+			data = None
 			try:
-				buf.fromfile(f, self._bufsize)
-			except (EOFError, IOError):
-				pass
-
-			if buf:
-				try:
-					# Python >=3.2
-					data = buf.tobytes()
-				except AttributeError:
-					data = buf.tostring()
-				self._read_data.append(data)
+				data = os.read(fd, self._bufsize)
+			except IOError as e:
+				if e.errno not in (errno.EAGAIN,):
+					raise
 			else:
-				self._unregister()
-				self.wait()
+				if data:
+					self._read_data.append(data)
+				else:
+					self._unregister()
+					self.wait()
 
 		self._unregister_if_appropriate(event)