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 <gentoo-commits+bounces-408461-garchives=archives.gentoo.org@lists.gentoo.org>) id 1RaYXn-0003Xf-5T for garchives@archives.gentoo.org; Tue, 13 Dec 2011 20:01:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5847121C1C2; Tue, 13 Dec 2011 20:01:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2348521C1C2 for <gentoo-commits@lists.gentoo.org>; Tue, 13 Dec 2011 20:01:34 +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 9BCF21B401D for <gentoo-commits@lists.gentoo.org>; Tue, 13 Dec 2011 20:01:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A269B8004A for <gentoo-commits@lists.gentoo.org>; Tue, 13 Dec 2011 20:01:32 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <4d9c153df82200d76684b6a9de69994c5f325971.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/FifoIpcDaemon.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4d9c153df82200d76684b6a9de69994c5f325971 Date: Tue, 13 Dec 2011 20:01:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 99e99363-124b-4a9b-bba5-da565c638207 X-Archives-Hash: 8589226b064fbac1356b2c67373988cf commit: 4d9c153df82200d76684b6a9de69994c5f325971 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Dec 13 20:01:23 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Dec 13 20:01:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4d9c153d FifoIpcDaemon: use plain fd instead of fdopen --- pym/_emerge/FifoIpcDaemon.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py index a716dac..b1f7a95 100644 --- a/pym/_emerge/FifoIpcDaemon.py +++ b/pym/_emerge/FifoIpcDaemon.py @@ -15,14 +15,14 @@ class FifoIpcDaemon(AbstractPollTask): =20 def _start(self): self._files =3D self._files_dict() - input_fd =3D os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK) =20 # File streams are in unbuffered mode since we do atomic # read and write of whole pickles. - self._files.pipe_in =3D os.fdopen(input_fd, 'rb', 0) + self._files.pipe_in =3D \ + os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK) =20 self._reg_id =3D self.scheduler.register( - self._files.pipe_in.fileno(), + self._files.pipe_in, self._registered_events, self._input_handler) =20 self._registered =3D True @@ -32,12 +32,12 @@ class FifoIpcDaemon(AbstractPollTask): Re-open the input stream, in order to suppress POLLHUP events (bug #339976). """ - self._files.pipe_in.close() - input_fd =3D os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK) - self._files.pipe_in =3D os.fdopen(input_fd, 'rb', 0) self.scheduler.unregister(self._reg_id) + os.close(self._files.pipe_in) + self._files.pipe_in =3D \ + os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK) self._reg_id =3D self.scheduler.register( - self._files.pipe_in.fileno(), + self._files.pipe_in, self._registered_events, self._input_handler) =20 def isAlive(self): @@ -77,5 +77,5 @@ class FifoIpcDaemon(AbstractPollTask): =20 if self._files is not None: for f in self._files.values(): - f.close() + os.close(f) self._files =3D None