[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/, lib/portage/

[Zac Medico]

commit:     ea889ce3eef083ff1e2658d0e70e7bed38015332
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 20:37:52 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 22:02:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ea889ce3

Alway import iscoroutinefunction from inspect

This is available in all supported python versions.

Fixes: 7218c9cea618 ("Fix asyncio.iscoroutinefunction DeprecationWarning in 
Python 3.14.0a1")
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/process.py                        | 6 +-----
 lib/portage/util/futures/_asyncio/__init__.py | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/portage/process.py b/lib/portage/process.py
index a66b6a5410..3f2c48e927 100644
--- a/lib/portage/process.py
+++ b/lib/portage/process.py
@@ -22,11 +22,7 @@ import warnings
 from dataclasses import dataclass
 from functools import lru_cache, partial
 from typing import Any, Optional, Callable, Union
-
-try:
-    from inspect import iscoroutinefunction
-except ImportError:
-    iscoroutinefunction = _asyncio.iscoroutinefunction
+from inspect import iscoroutinefunction
 
 from portage import os
 from portage import _encodings

diff --git a/lib/portage/util/futures/_asyncio/__init__.py 
b/lib/portage/util/futures/_asyncio/__init__.py
index ea67adcae4..9f248bf90e 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -44,11 +44,7 @@ from asyncio import (
     wait_for,
 )
 
-try:
-    from inspect import iscoroutinefunction
-except ImportError:
-    iscoroutinefunction = _asyncio.iscoroutinefunction
-
+from inspect import iscoroutinefunction
 import threading
 from typing import Optional