add pre-commit & fix new static test failures

Author: penguinolog

.pre-commit-config.yaml

@@ -0,0 +1,46 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+    - id: check-yaml
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+    - id: mixed-line-ending
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.9.3
+    hooks:
+    - id: isort
+      name: isort (python)
+    - id: isort
+      name: isort (cython)
+      types: [cython]
+    - id: isort
+      name: isort (pyi)
+      types: [pyi]
+
+  - repo: https://github.com/psf/black
+    rev: 21.10b0
+    hooks:
+    - id: black
+      # It is recommended to specify the latest version of Python
+      # supported by your project here, or alternatively use
+      # pre-commit's default_language_version, see
+      # https://pre-commit.com/#top_level-default_language_version
+      language_version: python3.7
+      always_run: true
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.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://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+    - id: flake8
+      additional_dependencies: [flake8-bugbear, pep8-naming, flake8-docstrings]
+      exclude: test

exec_helpers/__init__.py

@@ -56,15 +56,15 @@
     "ParallelCallExceptions",
 )
 
-__locals: typing.Dict[str, typing.Any] = locals()  # use mutable access for pure lazy loading
+__locals: dict[str, typing.Any] = locals()  # use mutable access for pure lazy loading
 
 __lazy_load_modules: typing.Sequence[str] = (
     "async_api",
     "exceptions",
     "exec_result",
 )
 
-__lazy_load_parent_modules: typing.Dict[str, str] = {
+__lazy_load_parent_modules: dict[str, str] = {
     "HostsSSHConfigs": "_ssh_helpers",
     "SSHConfig": "_ssh_helpers",
     "SSHClient": "ssh",
@@ -86,7 +86,7 @@
     "ParallelCallExceptions": "exceptions",
 }
 
-_deprecated: typing.Dict[str, str] = {"ParallelCallExceptions": "ParallelCallExceptionsError"}
+_deprecated: dict[str, str] = {"ParallelCallExceptions": "ParallelCallExceptionsError"}
 
 
 def __getattr__(name: str) -> typing.Any:

exec_helpers/__init__.pyi

@@ -73,7 +73,7 @@ __all__ = (
     "ParallelCallExceptions",
 )
 
-_deprecated: typing.Dict[str, str] = ...
+_deprecated: dict[str, str] = ...
 
 def __getattr__(name: str) -> typing.Any:
     """Get attributes lazy.
@@ -84,7 +84,7 @@ def __getattr__(name: str) -> typing.Any:
 
 __author__: str = ...
 __author_email__: str = ...
-__maintainers__: typing.Dict[str, str] = ...
+__maintainers__: dict[str, str] = ...
 __url__: str = ...
 __description__: str = ...
 __license__: str = ...

exec_helpers/_helpers.py

@@ -9,7 +9,7 @@
 import typing
 
 
-def string_bytes_bytearray_as_bytes(src: typing.Union[str, bytes, bytearray]) -> bytes:
+def string_bytes_bytearray_as_bytes(src: str | bytes | bytearray) -> bytes:
     """Get bytes string from string/bytes/bytearray union.
 
     :param src: source string or bytes-like object
@@ -36,7 +36,7 @@ def _mask_command(text: str, rules: str) -> str:
     :return: source with all MATCHED groups replaced by '<*masked*>'
     :rtype: str
     """
-    masked: typing.List[str] = []
+    masked: list[str] = []
 
     # places to exclude
     prev = 0
@@ -51,7 +51,7 @@ def _mask_command(text: str, rules: str) -> str:
     return "".join(masked)
 
 
-def mask_command(text: str, *rules: typing.Optional[str]) -> str:
+def mask_command(text: str, *rules: str | None) -> str:
     """Apply all rules to command.
 
     :param text: source text
@@ -64,7 +64,7 @@ def mask_command(text: str, *rules: typing.Optional[str]) -> str:
     return functools.reduce(_mask_command, (rule for rule in rules if rule is not None), text)
 
 
-def cmd_to_string(command: typing.Union[str, typing.Iterable[str]]) -> str:
+def cmd_to_string(command: str | typing.Iterable[str]) -> str:
     """Convert command to string for usage with shell.
 
     :param command: original command.
@@ -77,7 +77,7 @@ def cmd_to_string(command: typing.Union[str, typing.Iterable[str]]) -> str:
     return " ".join(shlex.quote(elem) for elem in command)
 
 
-def chroot_command(command: str, chroot_path: typing.Optional[str] = None) -> str:
+def chroot_command(command: str, chroot_path: str | None = None) -> str:
     """Prepare command for chroot execution.
 
     :param command: original command.