This handles the changes: ``` diff --git a/lib/portage/util/_eventloop/asyncio_event_loop.py b/lib/portage/util/_eventloop/asyncio_event_loop.py index c69e5c2f01..7808682a63 100644 --- a/lib/portage/util/_eventloop/asyncio_event_loop.py +++ b/lib/portage/util/_eventloop/asyncio_event_loop.py @@ -9 +9,7 @@ from asyncio.events import AbstractEventLoop as _AbstractEventLoop -from asyncio.unix_events import ThreadedChildWatcher +try: + from asyncio.unix_events import _ThreadedChildWatcher as ThreadedChildWatcher +except ImportError: + try: + from asyncio.unix_events import ThreadedChildWatcher + except ImportError: + ThreadedChildWatcher = None @@ -12 +18 @@ try: - from asyncio.unix_events import PidfdChildWatcher + from asyncio.unix_events import _PidfdChildWatcher as PidfdChildWatcher @@ -14 +20,4 @@ except ImportError: - PidfdChildWatcher = None + try: + from asyncio.unix_events import PidfdChildWatcher + except ImportError: + PidfdChildWatcher = None @@ -126 +135,2 @@ class AsyncioEventLoop(_AbstractEventLoop): - watcher.attach_loop(self._loop) + if hasattr(watcher, 'attach_loop'): + watcher.attach_loop(self._loop) diff --git a/lib/portage/util/futures/unix_events.py b/lib/portage/util/futures/unix_events.py index 374497010c..7d65ba3788 100644 --- a/lib/portage/util/futures/unix_events.py +++ b/lib/portage/util/futures/unix_events.py @@ -1 +1 @@ -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2024 Gentoo Authors @@ -5 +4,0 @@ __all__ = ( - "AbstractChildWatcher", @@ -11 +9,0 @@ from asyncio import events -from asyncio.unix_events import AbstractChildWatcher ```
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/proj/portage.git/commit/?id=69c8459835261b03af71c74ad75596c9425bcb0b commit 69c8459835261b03af71c74ad75596c9425bcb0b Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2024-10-28 20:13:38 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2024-10-28 20:13:38 +0000 Handle python3.14 ChildWatcher changes Bug: https://bugs.gentoo.org/941955 Signed-off-by: Zac Medico <zmedico@gentoo.org> .../util/futures/asyncio/test_policy_wrapper_recursion.py | 7 ++++--- lib/portage/util/_eventloop/asyncio_event_loop.py | 13 +++++++++---- lib/portage/util/futures/unix_events.py | 8 ++------ 3 files changed, 15 insertions(+), 13 deletions(-)
