commit: 2ab6eed08c9eafa29de6100b19c9c072b17b9167 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Apr 29 04:06:25 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Apr 29 04:06:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2ab6eed0
PipeReaderBlockingIO._reader_thread: asyncio compat (bug 653856) Use call_soon_threadsafe for asyncio compatibility, and also remove idle_add from SchedulerInterface since there are no more consumers. Bug: https://bugs.gentoo.org/653856 pym/portage/util/_async/PipeReaderBlockingIO.py | 3 +-- pym/portage/util/_async/SchedulerInterface.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/util/_async/PipeReaderBlockingIO.py b/pym/portage/util/_async/PipeReaderBlockingIO.py index b426f7695..0727d2c6a 100644 --- a/pym/portage/util/_async/PipeReaderBlockingIO.py +++ b/pym/portage/util/_async/PipeReaderBlockingIO.py @@ -55,7 +55,7 @@ class PipeReaderBlockingIO(AbstractPollTask): del self._threads[f] if not self._threads: # Thread-safe callback to EventLoop - self.scheduler.idle_add(self._eof) + self.scheduler.call_soon_threadsafe(self._eof) break f.close() @@ -64,7 +64,6 @@ class PipeReaderBlockingIO(AbstractPollTask): if self.returncode is None: self.returncode = os.EX_OK self._async_wait() - return False def _cancel(self): self._terminate.set() diff --git a/pym/portage/util/_async/SchedulerInterface.py b/pym/portage/util/_async/SchedulerInterface.py index ab2a70852..acacf7c31 100644 --- a/pym/portage/util/_async/SchedulerInterface.py +++ b/pym/portage/util/_async/SchedulerInterface.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013 Gentoo Foundation +# Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import gzip @@ -14,7 +14,6 @@ class SchedulerInterface(SlotObject): _event_loop_attrs = ("IO_ERR", "IO_HUP", "IO_IN", "IO_NVAL", "IO_OUT", "IO_PRI", "child_watch_add", - "idle_add", "io_add_watch", "iteration", "source_remove",
