From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RWIxL-000532-3k for garchives@archives.gentoo.org; Fri, 02 Dec 2011 02:34:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8EFD21C027; Fri, 2 Dec 2011 02:34:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7296B21C027 for ; Fri, 2 Dec 2011 02:34:17 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E65121B4015 for ; Fri, 2 Dec 2011 02:34:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2496180044 for ; Fri, 2 Dec 2011 02:34:16 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <6b9a29652474f1139dc088322cf68f22f37e5fed.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PipeReader.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6b9a29652474f1139dc088322cf68f22f37e5fed Date: Fri, 2 Dec 2011 02:34:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c5cf7e97-e9ca-47a8-9dc9-d69a32afeebf X-Archives-Hash: 5f5fedef1e8e5b78d7a98053926b5d3d commit: 6b9a29652474f1139dc088322cf68f22f37e5fed Author: Zac Medico gentoo org> AuthorDate: Fri Dec 2 02:34:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Dec 2 02:34:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6b9a2965 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 =20 class PipeReader(AbstractPollTask): =20 @@ -59,26 +59,18 @@ class PipeReader(AbstractPollTask): =20 if event & PollConstants.POLLIN: =20 - for f in self.input_files.values(): - if fd =3D=3D f.fileno(): - break - - buf =3D array.array('B') + data =3D None try: - buf.fromfile(f, self._bufsize) - except (EOFError, IOError): - pass - - if buf: - try: - # Python >=3D3.2 - data =3D buf.tobytes() - except AttributeError: - data =3D buf.tostring() - self._read_data.append(data) + data =3D 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() =20 self._unregister_if_appropriate(event) =20