test_poll: fix array test

Since SpawnProcess no longer uses array, add conditional array support
to PipeReader and use that for tests.

1 files changed, 49 insertions, 0 deletions

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index b3c0b2d16..83e6c7b9c 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -1,6 +1,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+import array
 import errno
 import logging
 import os
@@ -21,6 +22,54 @@ class AbstractPollTask(AsynchronousTask):
 	def isAlive(self):
 		return bool(self._registered)
 
+	def _read_array(self, f, event):
+		"""
+		NOTE: array.fromfile() is used here only for testing purposes,
+		because it has bugs in all known versions of Python (including
+		Python 2.7 and Python 3.2).
+
+		| POLLIN | RETURN
+		| BIT    | VALUE
+		| ---------------------------------------------------
+		| 1      | Read self._bufsize into an instance of
+		|        | array.array('B') and return it, ignoring
+		|        | EOFError and IOError. An empty array
+		|        | indicates EOF.
+		| ---------------------------------------------------
+		| 0      | None
+		"""
+		buf = None
+		if event & PollConstants.POLLIN:
+			buf = array.array('B')
+			try:
+				buf.fromfile(f, self._bufsize)
+			except EOFError:
+				pass
+			except TypeError:
+				# Python 3.2:
+				# TypeError: read() didn't return bytes
+				pass
+			except IOError as e:
+				# EIO happens with pty on Linux after the
+				# slave end of the pty has been closed.
+				if e.errno == errno.EIO:
+					# EOF: return empty string of bytes
+					pass
+				elif e.errno == errno.EAGAIN:
+					# EAGAIN: return None
+					buf = None
+				else:
+					raise
+
+		if buf is not None:
+			try:
+				# Python >=3.2
+				buf = buf.tobytes()
+			except AttributeError:
+				buf = buf.tostring()
+
+		return buf
+
 	def _read_buf(self, fd, event):
 		"""
 		| POLLIN | RETURN