From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18A8A1382C5 for ; Mon, 30 Apr 2018 06:29:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57AA0E0C4C; Mon, 30 Apr 2018 06:29:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35785E0C4C for ; Mon, 30 Apr 2018 06:29:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F7DE335C78 for ; Mon, 30 Apr 2018 06:29:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EE2F2A7 for ; Mon, 30 Apr 2018 06:29:26 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1525069201.2495fe6ff060e2ed8ee54e08a4dec132de1f4984.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/_async/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/_async/PipeLogger.py X-VCS-Directories: pym/portage/util/_async/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2495fe6ff060e2ed8ee54e08a4dec132de1f4984 X-VCS-Branch: master Date: Mon, 30 Apr 2018 06:29:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 340c5758-4339-48aa-9e8e-daa01f4ec7b3 X-Archives-Hash: 423e67380a7b72d3e4a0bed4ceb6894f commit: 2495fe6ff060e2ed8ee54e08a4dec132de1f4984 Author: Zac Medico gentoo org> AuthorDate: Mon Apr 30 05:52:07 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Apr 30 06:20:01 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2495fe6f PipeLogger: add_reader asyncio compat (bug 654382) Use add_reader for asyncio compatibility. Bug: https://bugs.gentoo.org/654382 pym/portage/util/_async/PipeLogger.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pym/portage/util/_async/PipeLogger.py b/pym/portage/util/_async/PipeLogger.py index 02de74b16..61000271d 100644 --- a/pym/portage/util/_async/PipeLogger.py +++ b/pym/portage/util/_async/PipeLogger.py @@ -21,7 +21,7 @@ class PipeLogger(AbstractPollTask): """ __slots__ = ("input_fd", "log_file_path", "stdout_fd") + \ - ("_log_file", "_log_file_real", "_reg_id") + ("_log_file", "_log_file_real") def _start(self): @@ -57,8 +57,7 @@ class PipeLogger(AbstractPollTask): fcntl.fcntl(fd, fcntl.F_SETFD, fcntl.fcntl(fd, fcntl.F_GETFD) | fcntl.FD_CLOEXEC) - self._reg_id = self.scheduler.io_add_watch(fd, - self._registered_events, self._output_handler) + self.scheduler.add_reader(fd, self._output_handler, fd) self._registered = True def _cancel(self): @@ -66,14 +65,14 @@ class PipeLogger(AbstractPollTask): if self.returncode is None: self.returncode = self._cancelled_returncode - def _output_handler(self, fd, event): + def _output_handler(self, fd): background = self.background stdout_fd = self.stdout_fd log_file = self._log_file while True: - buf = self._read_buf(fd, event) + buf = self._read_buf(fd, None) if buf is None: # not a POLLIN event, EAGAIN, etc... @@ -124,20 +123,13 @@ class PipeLogger(AbstractPollTask): log_file.write(buf) log_file.flush() - self._unregister_if_appropriate(event) - - return True - def _unregister(self): - - if self._reg_id is not None: - self.scheduler.source_remove(self._reg_id) - self._reg_id = None - if self.input_fd is not None: if isinstance(self.input_fd, int): + self.scheduler.remove_reader(self.input_fd) os.close(self.input_fd) else: + self.scheduler.remove_reader(self.input_fd.fileno()) self.input_fd.close() self.input_fd = None