exec-helpers 8.1.2__tar.gz → 8.2.0__tar.gz

exec_helpers-8.2.0/.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+    - id: check-yaml
+    - id: check-toml
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+    - id: mixed-line-ending
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.15.13
+    hooks:
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.10.0  # Use the ref you want to point at
+    hooks:
+    - id: python-check-blanket-noqa
+    - id: python-check-blanket-type-ignore
+    - id: rst-directive-colons
+    - id: rst-inline-touching-normal
+
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    # Use the sha / tag you want to point at
+    # or use `pre-commit autoupdate` to get the latest version
+    rev: "v2.21.2"
+    hooks:
+      - id: pyproject-fmt

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/PKG-INFO

@@ -1,48 +1,44 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: exec-helpers
-Version: 8.1.2
+Version: 8.2.0
 Summary: Execution helpers for simplified usage of subprocess and ssh.
-Home-page: https://github.com/python-useful-helpers/exec-helpers
-Author-email: Alexey Stepanov <penguinolog@gmail.com>
+Author-email: Aleksei Stepanov <penguinolog@gmail.com>
 Maintainer-email: Aleksei Stepanov <penguinolog@gmail.com>, Antonio Esposito <esposito.cloud@gmail.com>, Dennis Dmitriev <dis-xcom@gmail.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Documentation, https://exec-helpers.readthedocs.io/
 Project-URL: Repository, https://github.com/python-useful-helpers/exec-helpers
 Project-URL: Bug Tracker, https://github.com/python-useful-helpers/exec-helpers/issues
-Keywords: subprocess,ssh
+Keywords: ssh,subprocess
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8.0
+Requires-Python: >=3.11.0
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: paramiko>=2.4
 Requires-Dist: tenacity>=4.4.0
 Requires-Dist: psutil>=5.0
 Provides-Extra: xml
-Requires-Dist: defusedxml; extra == "xml"
 Provides-Extra: lxml
 Requires-Dist: lxml>=4.6.2; extra == "lxml"
 Provides-Extra: yaml
-Requires-Dist: PyYAML>=3.12; extra == "yaml"
+Requires-Dist: pyyaml>=3.12; extra == "yaml"
 Provides-Extra: all-formats
-Requires-Dist: defusedxml; extra == "all-formats"
 Requires-Dist: lxml>=4.6.2; extra == "all-formats"
-Requires-Dist: PyYAML>=3.12; extra == "all-formats"
+Requires-Dist: pyyaml>=3.12; extra == "all-formats"
 Provides-Extra: all-formats
-Requires-Dist: defusedxml; extra == "all-formats"
 Requires-Dist: lxml>=4.6.2; extra == "all-formats"
-Requires-Dist: PyYAML>=3.12; extra == "all-formats"
+Requires-Dist: pyyaml>=3.12; extra == "all-formats"
+Dynamic: license-file
 
 exec-helpers
 ============

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/classifiers.txt

@@ -1,13 +1,12 @@
 Development Status :: 5 - Production/Stable
 Intended Audience :: Developers
 Topic :: Software Development :: Libraries :: Python Modules
-License :: OSI Approved :: Apache Software License
 Programming Language :: Python :: 3
 Programming Language :: Python :: 3 :: Only
-Programming Language :: Python :: 3.8
-Programming Language :: Python :: 3.9
-Programming Language :: Python :: 3.10
 Programming Language :: Python :: 3.11
 Programming Language :: Python :: 3.12
+Programming Language :: Python :: 3.13
+Programming Language :: Python :: 3.14
+Programming Language :: Python :: 3.15
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: PyPy

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/__init__.py

@@ -20,7 +20,7 @@ import importlib
 import typing
 import warnings
 
-try:  # noqa: FURB107,SIM105,RUF100
+try:  # noqa: SIM105,S314,RUF100
     from ._version import version as __version__  # noqa: F401
 except ImportError:
     pass

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/_helpers.py

@@ -94,5 +94,5 @@ def chroot_command(command: str, chroot_path: str | None = None, chroot_exe: str
     if chroot_path and chroot_path != "/":
         chroot_dst: str = shlex.quote(chroot_path.strip())
         quoted_command = shlex.quote(command)
-        return f'{chroot_exe} {chroot_dst} sh -c {shlex.quote(f"eval {quoted_command}")}'
+        return f"{chroot_exe} {chroot_dst} sh -c {shlex.quote(f'eval {quoted_command}')}"
     return command

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/_ssh_base.py

@@ -19,6 +19,7 @@
 from __future__ import annotations
 
 import concurrent.futures
+import contextlib
 import copy
 import datetime
 import getpass
@@ -49,8 +50,7 @@ if typing.TYPE_CHECKING:
     from collections.abc import Iterable
     from collections.abc import Sequence
     from types import TracebackType
-
-    from typing_extensions import Self
+    from typing import Self
 
     from exec_helpers.api import CalledProcessErrorSubClassT
     from exec_helpers.api import CommandT
@@ -65,8 +65,8 @@ if typing.TYPE_CHECKING:
 
 __all__ = ("SSHClientBase", "SshExecuteAsyncResult", "SupportPathT")
 
-KeepAlivePeriodT = typing.Union[int, bool]
-SupportPathT = typing.Union[str, pathlib.PurePath]
+KeepAlivePeriodT = int | bool
+SupportPathT = str | pathlib.PurePath
 
 
 class RetryOnExceptions(tenacity.retry_if_exception):
@@ -135,7 +135,7 @@ class SshExecuteAsyncResult(api.ExecuteAsyncResult):
         return super().stdout
 
 
-class _SSHExecuteContext(api.ExecuteContext, typing.ContextManager[SshExecuteAsyncResult]):
+class _SSHExecuteContext(api.ExecuteContext, contextlib.AbstractContextManager[SshExecuteAsyncResult]):
     """SSH Execute context."""
 
     __slots__ = (
@@ -308,7 +308,7 @@ class _SSHExecuteContext(api.ExecuteContext, typing.ContextManager[SshExecuteAsy
             stderr = None
         _stdin: paramiko.channel.ChannelFile
         with chan.makefile("wb") as _stdin:
-            started = datetime.datetime.now(tz=datetime.timezone.utc)
+            started = datetime.datetime.now(tz=datetime.UTC)
             if self.__sudo_mode:
                 chan.exec_command(self.command)  # nosec  # Sanitize on caller side
                 if not stdout.channel.closed:
@@ -358,7 +358,7 @@ class _SSHExecuteContext(api.ExecuteContext, typing.ContextManager[SshExecuteAsy
             self.__chan = None
 
 
-class _SudoContext(typing.ContextManager[None]):
+class _SudoContext(contextlib.AbstractContextManager[None]):
     """Context manager for call commands with sudo.
 
     :param ssh: Connection instance.
@@ -389,7 +389,7 @@ class _SudoContext(typing.ContextManager[None]):
         self.__ssh.sudo_mode = self.__sudo_status
 
 
-class _KeepAliveContext(typing.ContextManager[None]):
+class _KeepAliveContext(contextlib.AbstractContextManager[None]):
     """Context manager for keepalive management.
 
     :param ssh: Connection instance.
@@ -456,6 +456,8 @@ class SSHClientBase(api.ExecHelper):
     :type keepalive: int | bool
     :param allow_ssh_agent: Use SSH Agent if available.
     :type allow_ssh_agent: bool
+    :param missing_host_key_policy: Missing host key policy class. See paramiko.MissingHostKeyPolicy for details.
+    :type missing_host_key_policy: type[paramiko.MissingHostKeyPolicy]
 
     .. note:: auth has priority over username/password/private_keys.
     .. note::
@@ -474,6 +476,7 @@ class SSHClientBase(api.ExecHelper):
     .. versionchanged:: 7.0.0 keepalive_mode is removed.
     .. versionchanged:: 7.4.0 Return of keepalive_mode to prevent mix with a keepalive period. Default is `False`.
     .. versionchanged:: 8.0.0 Expose SSH Agent usage override.
+    .. versionchanged:: 8.1.4 Allow specifying missing_host_key_policy.
     """
 
     __slots__ = (
@@ -490,6 +493,7 @@ class SSHClientBase(api.ExecHelper):
         "__ssh_config",
         "__sudo_mode",
         "__verbose",
+        "_missing_host_key_policy",
     )
 
     def __hash__(self) -> int:
@@ -514,6 +518,7 @@ class SSHClientBase(api.ExecHelper):
         sock: paramiko.ProxyCommand | paramiko.Channel | socket.socket | None = None,
         keepalive: KeepAlivePeriodT = 1,
         allow_ssh_agent: bool = True,
+        missing_host_key_policy: type[paramiko.MissingHostKeyPolicy] = paramiko.WarningPolicy,
     ) -> None:
         """Main SSH Client helper."""
         self.__sudo_mode = False
@@ -521,6 +526,7 @@ class SSHClientBase(api.ExecHelper):
         self.__keepalive_mode = False
         self.__verbose: bool = verbose
         self.__sock = sock
+        self._missing_host_key_policy = missing_host_key_policy
 
         self.__ssh: paramiko.SSHClient
         self.__sftp: paramiko.SFTPClient | None = None
@@ -754,7 +760,8 @@ class SSHClientBase(api.ExecHelper):
         with self.lock:
             if self.__sock is not None:
                 self.__ssh = paramiko.SSHClient()
-                self.__ssh.set_missing_host_key_policy(paramiko.WarningPolicy())
+                self.__ssh.load_system_host_keys()
+                self.__ssh.set_missing_host_key_policy(self._missing_host_key_policy)
                 self.auth.connect(
                     client=self.__ssh,
                     hostname=self.hostname,
@@ -780,7 +787,8 @@ class SSHClientBase(api.ExecHelper):
         """
 
         last_ssh_client: paramiko.SSHClient = paramiko.SSHClient()
-        last_ssh_client.set_missing_host_key_policy(paramiko.WarningPolicy())  # noqa: S507,RUF100
+        last_ssh_client.load_system_host_keys()
+        last_ssh_client.set_missing_host_key_policy(self._missing_host_key_policy)
 
         config, auth = self.__conn_chain[0]
 
@@ -794,7 +802,8 @@ class SSHClientBase(api.ExecHelper):
 
         for config, auth in self.__conn_chain[1:]:  # start has another logic, so do it out of cycle
             ssh = paramiko.SSHClient()
-            ssh.set_missing_host_key_policy(paramiko.WarningPolicy())  # noqa: S507,RUF100
+            ssh.load_system_host_keys()
+            ssh.set_missing_host_key_policy(self._missing_host_key_policy)
 
             if config.proxyjump:
                 transport = last_ssh_client.get_transport()
@@ -869,7 +878,8 @@ class SSHClientBase(api.ExecHelper):
         try:
             self.__ssh.close()
         except BaseException as e:  # pragma: no cover  # NOSONAR
-            self.logger.debug(f"Exception in {self!s} destructor call: {e}")
+            with contextlib.suppress(AttributeError):
+                self.logger.debug(f"Exception in {self!s} destructor call: {e}")
         self.__sftp = None
 
     def __exit__(
@@ -995,12 +1005,12 @@ class SSHClientBase(api.ExecHelper):
             return super()._prepare_command(cmd=cmd, chroot_path=chroot_path, chroot_exe=chroot_exe)
         quoted_command: str = shlex.quote(cmd)
         if chroot_path is self._chroot_path is None:
-            return f'sudo -S sh -c {shlex.quote(f"eval {quoted_command}")}'
+            return f"sudo -S sh -c {shlex.quote(f'eval {quoted_command}')}"
         if chroot_path is not None:
             target_path: str = shlex.quote(chroot_path)
         else:
             target_path = shlex.quote(self._chroot_path)  # type: ignore[arg-type]
-        return f'{chroot_exe} {target_path} sudo sh -c {shlex.quote(f"eval {quoted_command}")}'
+        return f"{chroot_exe} {target_path} sudo sh -c {shlex.quote(f'eval {quoted_command}')}"
 
     def _exec_command(  # type: ignore[override]
         self,
@@ -1777,7 +1787,7 @@ class SSHClientBase(api.ExecHelper):
                 results[remote.hostname, remote.port] = result
                 if result.exit_code not in prep_expected:
                     errors[remote.hostname, remote.port] = result
-            except Exception as e:  # noqa: PERF203
+            except Exception as e:
                 raised_exceptions[remote.hostname, remote.port] = e
 
         if raised_exceptions:  # always raise

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/_ssh_helpers.py

@@ -5,17 +5,16 @@ from __future__ import annotations
 import functools
 import pathlib
 import typing
+from collections.abc import Collection
 
 import paramiko
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Collection
-
     # noinspection PyPackageRequirements
     import logwrap
 
-SSHConfigDictLikeT = typing.Dict[str, typing.Union[str, int, bool, typing.Collection[str]]]
-SSHConfigsDictT = typing.Dict[str, SSHConfigDictLikeT]
+SSHConfigDictLikeT = dict[str, str | int | bool | Collection[str]]
+SSHConfigsDictT = dict[str, SSHConfigDictLikeT]
 
 
 # Parse default SSHConfig if available
@@ -379,7 +378,7 @@ class SSHConfig:
         return self.__controlmaster
 
 
-class HostsSSHConfigs(typing.Dict[str, SSHConfig]):
+class HostsSSHConfigs(dict[str, SSHConfig]):
     """Specific dictionary for managing SSHConfig records.
 
     Instead of creating a new record by request, just generate default value and return if not exists.

exec_helpers-8.2.0/exec_helpers/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '8.2.0'
+__version_tuple__ = version_tuple = (8, 2, 0)
+
+__commit_id__ = commit_id = 'g9b1f831aa'

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/api.py

@@ -21,10 +21,14 @@
 from __future__ import annotations
 
 import abc
+import contextlib
 import logging
 import pathlib
+import re
 import threading
 import typing
+from collections.abc import Callable
+from collections.abc import Iterable
 
 from exec_helpers import constants
 from exec_helpers import exceptions
@@ -39,8 +43,7 @@ if typing.TYPE_CHECKING:
     import datetime
     from collections.abc import Sequence
     from types import TracebackType
-
-    from typing_extensions import Self
+    from typing import Self
 
 __all__ = (
     "CalledProcessErrorSubClassT",
@@ -55,13 +58,13 @@ __all__ = (
     "OptionalTimeoutT",
 )
 
-CommandT = typing.Union[str, typing.Iterable[str]]
-LogMaskReT = typing.Union[str, typing.Pattern[str], None]
-ErrorInfoT = typing.Optional[str]
-ChRootPathSetT = typing.Optional[typing.Union[str, pathlib.Path]]
-ExpectedExitCodesT = typing.Iterable[ExitCodeT]
-OptionalTimeoutT = typing.Union[int, float, None]
-CalledProcessErrorSubClassT = typing.Type[exceptions.CalledProcessError]
+CommandT = str | Iterable[str]
+LogMaskReT = str | re.Pattern[str] | None
+ErrorInfoT = str | None
+ChRootPathSetT = str | pathlib.Path | None
+ExpectedExitCodesT = Iterable[ExitCodeT]
+OptionalTimeoutT = int | float | None
+CalledProcessErrorSubClassT = type[exceptions.CalledProcessError]
 
 
 class ExecuteAsyncResult(typing.NamedTuple):
@@ -74,7 +77,7 @@ class ExecuteAsyncResult(typing.NamedTuple):
     started: datetime.datetime
 
 
-class ExecuteContext(typing.ContextManager[ExecuteAsyncResult], abc.ABC):
+class ExecuteContext(contextlib.AbstractContextManager[ExecuteAsyncResult], abc.ABC):
     """Execute context manager."""
 
     __slots__ = (
@@ -165,7 +168,7 @@ class ExecuteContext(typing.ContextManager[ExecuteAsyncResult], abc.ABC):
 
 
 # noinspection PyProtectedMember
-class _ChRootContext(typing.ContextManager[None]):
+class _ChRootContext(contextlib.AbstractContextManager[None]):
     """Context manager for call commands with chroot.
 
     :param conn: Connection instance.
@@ -219,8 +222,8 @@ class _ChRootContext(typing.ContextManager[None]):
 
 
 class ExecHelper(
-    typing.Callable[..., exec_result.ExecResult],  # type: ignore[misc]
-    typing.ContextManager["ExecHelper"],
+    Callable[..., exec_result.ExecResult],  # type: ignore[misc]
+    contextlib.AbstractContextManager["ExecHelper"],
     abc.ABC,
 ):
     """ExecHelper global API.

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/async_api/api.py

@@ -21,9 +21,12 @@ from __future__ import annotations
 
 import abc
 import asyncio
+import contextlib
 import logging
 import pathlib
 import typing
+from collections.abc import Awaitable
+from collections.abc import Callable
 
 from exec_helpers import api
 from exec_helpers import constants
@@ -43,8 +46,7 @@ from .. import _helpers
 if typing.TYPE_CHECKING:
     import types
     from collections.abc import Sequence
-
-    from typing_extensions import Self
+    from typing import Self
 
     from exec_helpers.async_api import exec_result
     from exec_helpers.proc_enums import ExitCodeT
@@ -62,7 +64,7 @@ __all__ = (
 )
 
 
-class ExecuteContext(typing.AsyncContextManager[api.ExecuteAsyncResult], abc.ABC):
+class ExecuteContext(contextlib.AbstractAsyncContextManager[api.ExecuteAsyncResult], abc.ABC):
     """Execute context manager."""
 
     __slots__ = (
@@ -153,7 +155,7 @@ class ExecuteContext(typing.AsyncContextManager[api.ExecuteAsyncResult], abc.ABC
 
 
 # noinspection PyProtectedMember
-class _ChRootContext(typing.AsyncContextManager[None]):
+class _ChRootContext(contextlib.AbstractAsyncContextManager[None]):
     """Async extension for chroot.
 
     :param conn: Connection instance.
@@ -203,8 +205,8 @@ class _ChRootContext(typing.AsyncContextManager[None]):
 
 
 class ExecHelper(
-    typing.Callable[..., typing.Awaitable["ExecHelper"]],  # type: ignore[misc]
-    typing.AsyncContextManager["ExecHelper"],
+    Callable[..., Awaitable["ExecHelper"]],  # type: ignore[misc]
+    contextlib.AbstractAsyncContextManager["ExecHelper"],
     abc.ABC,
 ):
     """Subprocess helper with timeouts and lock-free FIFO.
@@ -374,7 +376,7 @@ class ExecHelper(
         self,
         command: str,
         async_result: api.ExecuteAsyncResult,
-        timeout: OptionalTimeoutT,
+        timeout: OptionalTimeoutT,  # noqa: ASYNC109
         *,
         verbose: bool = False,
         log_mask_re: LogMaskReT = None,
@@ -460,7 +462,7 @@ class ExecHelper(
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         *,
         log_mask_re: LogMaskReT = None,
         stdin: OptionalStdinT = None,
@@ -543,7 +545,7 @@ class ExecHelper(
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         *,
         log_mask_re: LogMaskReT = None,
         stdin: OptionalStdinT = None,
@@ -607,7 +609,7 @@ class ExecHelper(
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         error_info: ErrorInfoT = None,
         expected: ExpectedExitCodesT = (proc_enums.EXPECTED,),
         raise_on_err: bool = True,
@@ -685,7 +687,7 @@ class ExecHelper(
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         error_info: ErrorInfoT = None,
         raise_on_err: bool = True,
         *,

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/async_api/subprocess.py

@@ -106,7 +106,9 @@ class SubprocessExecuteAsyncResult(subprocess.SubprocessExecuteAsyncResult):
         return super().stdout  # type: ignore[return-value]
 
 
-class _SubprocessExecuteContext(api.ExecuteContext, typing.AsyncContextManager[SubprocessExecuteAsyncResult]):
+class _SubprocessExecuteContext(
+    api.ExecuteContext, contextlib.AbstractAsyncContextManager[SubprocessExecuteAsyncResult]
+):
     """Subprocess Execute context."""
 
     __slots__ = ("__cwd", "__env", "__process")
@@ -181,7 +183,7 @@ class _SubprocessExecuteContext(api.ExecuteContext, typing.AsyncContextManager[S
 
         The Command is executed only in the context manager to be sure that everything will be cleaned up properly.
         """
-        started = datetime.datetime.now(tz=datetime.timezone.utc)
+        started = datetime.datetime.now(tz=datetime.UTC)
 
         self.__process = await asyncio.create_subprocess_shell(
             cmd=self.command,
@@ -269,7 +271,7 @@ class Subprocess(api.ExecHelper):
         self,
         command: str,
         async_result: SubprocessExecuteAsyncResult,
-        timeout: OptionalTimeoutT,
+        timeout: OptionalTimeoutT,  # noqa: ASYNC109
         *,
         verbose: bool = False,
         log_mask_re: LogMaskReT = None,
@@ -326,7 +328,7 @@ class Subprocess(api.ExecHelper):
             # Wait real timeout here
             exit_code: int = await asyncio.wait_for(async_result.interface.wait(), timeout=timeout)
             result.exit_code = exit_code
-        except asyncio.TimeoutError as exc:
+        except TimeoutError as exc:
             # kill -9 for all subprocesses
             _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
             exit_signal: int | None = await asyncio.wait_for(async_result.interface.wait(), timeout=0.001)
@@ -389,8 +391,8 @@ class Subprocess(api.ExecHelper):
         """
         if env_patch is not None:
             # make mutable copy
-            env = dict(copy.deepcopy(os.environ) if env is None else copy.deepcopy(env))  # type: ignore[arg-type]
-            env.update(env_patch)  # type: ignore[arg-type]
+            env = dict(copy.deepcopy(os.environ) if env is None else copy.deepcopy(env))
+            env.update(env_patch)
         return _SubprocessExecuteContext(
             command=f"{self._prepare_command(cmd=command, chroot_path=chroot_path, chroot_exe=chroot_exe)}\n",
             stdin=None if stdin is None else self._string_bytes_bytearray_as_bytes(stdin),
@@ -406,7 +408,7 @@ class Subprocess(api.ExecHelper):
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         *,
         log_mask_re: LogMaskReT = None,
         stdin: OptionalStdinT = None,
@@ -485,7 +487,7 @@ class Subprocess(api.ExecHelper):
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         *,
         log_mask_re: LogMaskReT = None,
         stdin: OptionalStdinT = None,
@@ -562,7 +564,7 @@ class Subprocess(api.ExecHelper):
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         error_info: ErrorInfoT = None,
         expected: ExpectedExitCodesT = (proc_enums.EXPECTED,),
         raise_on_err: bool = True,
@@ -649,7 +651,7 @@ class Subprocess(api.ExecHelper):
         self,
         command: CommandT,
         verbose: bool = False,
-        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,
+        timeout: OptionalTimeoutT = constants.DEFAULT_TIMEOUT,  # noqa: ASYNC109
         error_info: ErrorInfoT = None,
         raise_on_err: bool = True,
         *,

{exec_helpers-8.1.2 → exec_helpers-8.2.0}/exec_helpers/exceptions.py

@@ -274,7 +274,7 @@ class ParallelCallProcessError(ExecCalledProcessError):
 class ParallelCallExceptionsError(ParallelCallProcessError):
     """Exception raised during parallel call as result of exceptions."""
 
-    __slots__ = ("cmd", "exceptions")
+    __slots__ = ("exceptions",)
 
     def __init__(
         self,