commit: 532366feaf8e3cb04e0d19d90498cfe0b9361ab1 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Apr 28 23:27:49 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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()
