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 559761382C5 for ; Sat, 28 Apr 2018 23:29:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80B95E07AE; Sat, 28 Apr 2018 23:29:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5E8C5E07AE for ; Sat, 28 Apr 2018 23:29:08 +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 E1229335C93 for ; Sat, 28 Apr 2018 23:29:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77C70272 for ; Sat, 28 Apr 2018 23:29:05 +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: <1524958069.532366feaf8e3cb04e0d19d90498cfe0b9361ab1.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/PipeReaderBlockingIO.py X-VCS-Directories: pym/portage/util/_async/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 532366feaf8e3cb04e0d19d90498cfe0b9361ab1 X-VCS-Branch: master Date: Sat, 28 Apr 2018 23:29:05 +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: 625a4109-dcb7-4989-9401-cc1139c21e23 X-Archives-Hash: d951107fa3b8e911836413744e0932e3 commit: 532366feaf8e3cb04e0d19d90498cfe0b9361ab1 Author: Zac Medico gentoo org> AuthorDate: Sat Apr 28 23:27:49 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Apr 28 23:27:49 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=532366fe PipeReaderBlockingIO: fix deprecated _wait usage (bug 653856) Use _async_wait() instead of wait(). Bug: https://bugs.gentoo.org/653856 pym/portage/util/_async/PipeReaderBlockingIO.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage/util/_async/PipeReaderBlockingIO.py b/pym/portage/util/_async/PipeReaderBlockingIO.py index b06adf6ed..b426f7695 100644 --- a/pym/portage/util/_async/PipeReaderBlockingIO.py +++ b/pym/portage/util/_async/PipeReaderBlockingIO.py @@ -1,4 +1,4 @@ -# Copyright 2012 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 try: @@ -63,7 +63,7 @@ class PipeReaderBlockingIO(AbstractPollTask): self._registered = False if self.returncode is None: self.returncode = os.EX_OK - self.wait() + self._async_wait() return False def _cancel(self): @@ -71,9 +71,12 @@ class PipeReaderBlockingIO(AbstractPollTask): self._registered = False if self.returncode is None: self.returncode = self._cancelled_returncode - self.wait() + self._async_wait() def _wait(self): + """ + Deprecated. Use _async_wait() instead. + """ if self.returncode is not None: return self.returncode self._wait_loop()