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 1RbdtH-0001W0-S6 for garchives@archives.gentoo.org; Fri, 16 Dec 2011 19:56:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB42F21C0AA; Fri, 16 Dec 2011 19:56:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AE91521C0AA for ; Fri, 16 Dec 2011 19:56:16 +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 3730A1B4036 for ; Fri, 16 Dec 2011 19:56:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9ED008004A for ; Fri, 16 Dec 2011 19:56:15 +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: <2eea0db1855009c3407ba6eae1dc095297769989.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: 2eea0db1855009c3407ba6eae1dc095297769989 Date: Fri, 16 Dec 2011 19:56:15 +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: 56fc8a7c-7833-4273-acad-d5e144a79d37 X-Archives-Hash: 11b57b8baf1073754dc3cd786adc9836 commit: 2eea0db1855009c3407ba6eae1dc095297769989 Author: Zac Medico gentoo org> AuthorDate: Fri Dec 16 19:56:01 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Dec 16 19:56:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2eea0db1 PipeReader: use AbstractPollTask._read_buf() --- pym/_emerge/PipeReader.py | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index a465c2a..9fedbff 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -3,8 +3,6 @@ =20 from portage import os from _emerge.AbstractPollTask import AbstractPollTask -from _emerge.PollConstants import PollConstants -import errno import fcntl =20 class PipeReader(AbstractPollTask): @@ -57,30 +55,16 @@ class PipeReader(AbstractPollTask): =20 def _output_handler(self, fd, event): =20 - if event & PollConstants.POLLIN: - - while True: - data =3D None - try: - data =3D os.read(fd, self._bufsize) - except OSError as e: - # EIO happens with pty on Linux after the - # slave end of the pty has been closed. - if e.errno =3D=3D errno.EIO: - self._unregister() - self.wait() - break - elif e.errno =3D=3D errno.EAGAIN: - break - else: - raise - else: - if data: - self._read_data.append(data) - else: - self._unregister() - self.wait() - break + while True: + data =3D self._read_buf(fd, event) + if data is None: + break + if data: + self._read_data.append(data) + else: + self._unregister() + self.wait() + break =20 self._unregister_if_appropriate(event) =20