IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove `sphinx.util.parallel` from the no-any-generics whitelist

Browse Source
This commit is contained in:
Adam Turner 2025-01-23 00:13:34 +00:00
parent 2a411dcb53
commit f071dc1b5b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyproject.toml
View File

@ -234,7 +234,6 @@ module = [
"sphinx.domains",
"sphinx.domains.c",
"sphinx.domains.cpp",
"sphinx.util.parallel",
]
disallow_any_generics = false

24
sphinx/util/parallel.py
View File

@ -35,12 +35,15 @@ class SerialTasks:
pass
def add_task(
self, task_func: Callable, arg: Any = None, result_func: Callable | None = None
self,
task_func: Callable[[Any], Any] | Callable[[], Any],
arg: Any = None,
result_func: Callable[[Any], Any] | None = None,
) -> None:
if arg is not None:
res = task_func(arg)
res = task_func(arg) # type: ignore[call-arg]
else:
res = task_func()
res = task_func() # type: ignore[call-arg]
if result_func:
result_func(res)
@ -54,7 +57,7 @@ class ParallelTasks:
def __init__(self, nproc: int) -> None:
self.nproc = nproc
# (optional) function performed by each task on the result of main task
self._result_funcs: dict[int, Callable] = {}
self._result_funcs: dict[int, Callable[[Any, Any], Any]] = {}
# task arguments
self._args: dict[int, list[Any] | None] = {}
# list of subprocesses (both started and waiting)
@ -68,14 +71,16 @@ class ParallelTasks:
# task number of each subprocess
self._taskid = 0
def _process(self, pipe: Any, func: Callable, arg: Any) -> None:
def _process(
self, pipe: Any, func: Callable[[Any], Any] | Callable[[], Any], arg: Any
) -> None:
try:
collector = logging.LogCollector()
with collector.collect():
if arg is None:
ret = func()
ret = func() # type: ignore[call-arg]
else:
ret = func(arg)
ret = func(arg) # type: ignore[call-arg]
failed = False
except BaseException as err:
failed = True
@ -85,7 +90,10 @@ class ParallelTasks:
pipe.send((failed, collector.logs, ret))
def add_task(
self, task_func: Callable, arg: Any = None, result_func: Callable | None = None
self,
task_func: Callable[[Any], Any] | Callable[[], Any],
arg: Any = None,
result_func: Callable[[Any, Any], Any] | None = None,
) -> None:
tid = self._taskid
self._taskid += 1