Fix: usage strip instead of rstrip for stdout/stderr lines

* fix static tests
* update pre-commit

Author: penguinolog

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     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
+    rev: 5.10.1
     hooks:
     - id: isort
       name: isort (python)
@@ -20,14 +20,14 @@ repos:
       types: [pyi]
 
   - repo: https://github.com/psf/black
-    rev: 21.10b0
+    rev: 22.3.0
     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
+      language_version: python3.9
       always_run: true
 
   - repo: https://github.com/pre-commit/pygrep-hooks

.pylintrc

@@ -28,8 +28,7 @@ limit-inference-results=100
 
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
-load-plugins=pylint.extensions.docparams,
-             pylint.extensions.docstyle,
+load-plugins=pylint.extensions.docstyle,
              pylint.extensions.overlapping_exceptions,
              pylint.extensions.emptystring,
              pylint.extensions.comparetozero,

exec_helpers/_ssh_base.py

@@ -68,7 +68,7 @@
 
 KeepAlivePeriodT = typing.Union[int, bool]
 SupportPathT = typing.Union[str, pathlib.PurePath]
-_RType = typing.TypeVar("_RType")
+_RT = typing.TypeVar("_RT")
 
 
 class RetryOnExceptions(tenacity.retry_if_exception):  # type: ignore[name-defined,misc]
@@ -653,12 +653,12 @@ def _ssh_transport(self) -> paramiko.Transport:
         """
         with self.lock:
             transport = self.__ssh.get_transport()
-            if transport is not None:
+            if transport is not None:  # pylint: disable=consider-using-assignment-expr
                 return transport
 
             self.reconnect()
             transport = self.__ssh.get_transport()
-            if transport is not None:
+            if transport is not None:  # pylint: disable=consider-using-assignment-expr
                 return transport
             raise ConnectionError("Can not get SSH transport (with reconnect)")
 
@@ -755,7 +755,7 @@ def __get_client(self) -> paramiko.SSHClient:
 
             if config.proxyjump:
                 transport = last_ssh_client.get_transport()
-                if transport is None:
+                if transport is None:  # pylint: disable=consider-using-assignment-expr
                     raise ConnectionError("Can not get SSH transport")
                 sock = transport.open_channel(
                     kind="direct-tcpip",
@@ -934,7 +934,7 @@ def _prepare_command(self, cmd: str, chroot_path: str | None = None) -> str:
         return f'chroot {target_path} sudo sh -c {shlex.quote(f"eval {quoted_command}")}'
 
     # noinspection PyMethodOverriding
-    def _execute_async(  # pylint: disable=arguments-differ
+    def _execute_async(
         self,
         command: str,
         *,
@@ -1128,7 +1128,7 @@ def poll_pipes() -> None:
         self.logger.debug(wait_err_msg)
         raise exceptions.ExecHelperTimeoutError(result=result, timeout=timeout)  # type: ignore[arg-type]
 
-    def open_execute_context(  # pylint: disable=arguments-differ
+    def open_execute_context(
         self,
         command: str,
         *,
@@ -1184,7 +1184,7 @@ def open_execute_context(  # pylint: disable=arguments-differ
             **kwargs,
         )
 
-    def execute(  # pylint: disable=arguments-differ
+    def execute(
         self,
         command: CommandT,
         verbose: bool = False,
@@ -1331,7 +1331,7 @@ def __call__(
             **kwargs,
         )
 
-    def check_call(  # pylint: disable=arguments-differ
+    def check_call(
         self,
         command: CommandT,
         verbose: bool = False,
@@ -1418,7 +1418,7 @@ def check_call(  # pylint: disable=arguments-differ
             **kwargs,
         )
 
-    def check_stderr(  # pylint: disable=arguments-differ
+    def check_stderr(
         self,
         command: CommandT,
         verbose: bool = False,

exec_helpers/async_api/subprocess.py

@@ -232,7 +232,7 @@ async def __aexit__(
         exc_tb: typing.Optional[types.TracebackType],
     ) -> None:
         process = self.__process
-        if process is not None:
+        if process is not None:  # pylint: disable=consider-using-assignment-expr
             _subprocess_helpers.kill_proc_tree(process.pid)
             try:
                 process.kill()
@@ -351,7 +351,7 @@ async def poll_stderr() -> None:
             # kill -9 for all subprocesses
             _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
             exit_signal: typing.Optional[int] = await asyncio.wait_for(async_result.interface.wait(), timeout=0.001)
-            if exit_signal is None:
+            if exit_signal is None:  # pylint: disable=consider-using-assignment-expr
                 raise exceptions.ExecHelperNoKillError(
                     result=result,
                     timeout=timeout,  # type: ignore[arg-type]
@@ -367,7 +367,7 @@ async def poll_stderr() -> None:
         raise exceptions.ExecHelperTimeoutError(result=result, timeout=timeout)  # type: ignore[arg-type]
 
     # noinspection PyMethodOverriding
-    async def _execute_async(  # pylint: disable=arguments-differ
+    async def _execute_async(
         self,
         command: str,
         *,
@@ -475,7 +475,7 @@ async def _execute_async(  # pylint: disable=arguments-differ
             started=started,
         )
 
-    def open_execute_context(  # pylint: disable=arguments-differ
+    def open_execute_context(
         self,
         command: str,
         *,
@@ -527,7 +527,7 @@ def open_execute_context(  # pylint: disable=arguments-differ
             **kwargs,
         )
 
-    async def execute(  # pylint: disable=arguments-differ
+    async def execute(
         self,
         command: CommandT,
         verbose: bool = False,
@@ -675,7 +675,7 @@ async def __call__(
             **kwargs,
         )
 
-    async def check_call(  # pylint: disable=arguments-differ
+    async def check_call(
         self,
         command: CommandT,
         verbose: bool = False,
@@ -762,7 +762,7 @@ async def check_call(  # pylint: disable=arguments-differ
             **kwargs,
         )
 
-    async def check_stderr(  # pylint: disable=arguments-differ
+    async def check_stderr(
         self,
         command: CommandT,
         verbose: bool = False,

exec_helpers/exec_result.py

@@ -119,7 +119,7 @@ def _get_str_from_bin(src: bytearray) -> str:
     :return: decoded string
     :rtype: str
     """
-    return src.strip().decode(encoding="utf-8", errors="backslashreplace")
+    return src.rstrip().decode(encoding="utf-8", errors="backslashreplace")
 
 
 def _get_bytearray_from_array(src: typing.Iterable[bytes]) -> bytearray:
@@ -641,7 +641,7 @@ def stdout_lxml(self) -> lxml.etree.Element:
             .. note:: Can be insecure.
             """
             with self.stdout_lock:
-                return lxml.etree.fromstring(b"".join(self.stdout))
+                return lxml.etree.fromstring(b"".join(self.stdout))  # nosec[blacklist]
 
     def __dir__(self) -> list[str]:
         """Override dir for IDE and as source for getitem checks.

exec_helpers/ssh_auth.py

@@ -82,8 +82,14 @@ def __init__(
 
         if keys is not None:
             for k in keys:
-                if k not in self.__keys and k != key:
-                    self.__keys.append(k)
+                if k is None:
+                    continue
+                if k not in self.__keys:
+                    if key is not None:
+                        if k != key:
+                            self.__keys.append(k)
+                    else:
+                        self.__keys.append(k)
 
         self.__keys.append(None)
 

exec_helpers/subprocess.py

@@ -356,7 +356,7 @@ def close_streams() -> None:
                 # kill -9 for all subprocesses
                 _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
                 exit_signal: int | None = async_result.interface.poll()
-                if exit_signal is None:
+                if exit_signal is None:  # pylint: disable=consider-using-assignment-expr
                     raise exceptions.ExecHelperNoKillError(
                         result=result,
                         timeout=timeout,  # type: ignore[arg-type]
@@ -379,7 +379,7 @@ def close_streams() -> None:
         raise exceptions.ExecHelperTimeoutError(result=result, timeout=timeout)  # type: ignore[arg-type]
 
     # noinspection PyMethodOverriding
-    def _execute_async(  # pylint: disable=arguments-differ
+    def _execute_async(
         self,
         command: str,
         *,
@@ -491,7 +491,7 @@ def _execute_async(  # pylint: disable=arguments-differ
             started=started,
         )
 
-    def open_execute_context(  # pylint: disable=arguments-differ
+    def open_execute_context(
         self,
         command: str,
         *,
@@ -543,7 +543,7 @@ def open_execute_context(  # pylint: disable=arguments-differ
             **kwargs,
         )
 
-    def execute(  # pylint: disable=arguments-differ
+    def execute(
         self,
         command: CommandT,
         verbose: bool = False,
@@ -691,7 +691,7 @@ def __call__(
             **kwargs,
         )
 
-    def check_call(  # pylint: disable=arguments-differ
+    def check_call(
         self,
         command: CommandT,
         verbose: bool = False,
@@ -778,7 +778,7 @@ def check_call(  # pylint: disable=arguments-differ
             **kwargs,
         )
 
-    def check_stderr(  # pylint: disable=arguments-differ
+    def check_stderr(
         self,
         command: CommandT,
         verbose: bool = False,

test/test_sshauth.py

@@ -50,8 +50,14 @@ def get_internal_keys(
         int_keys.append(key)
     if keys is not None:
         for k in keys:
-            if k not in int_keys and k != key:
-                int_keys.append(k)
+            if k is None:
+                continue
+            if k not in int_keys:
+                if key is not None:
+                    if k != key:
+                        int_keys.append(k)
+                else:
+                    int_keys.append(k)
 
     int_keys.append(None)
     return int_keys
@@ -116,7 +122,7 @@ def test_001_init_checks(run_parameters) -> None:
     _key = None if auth.public_key is None else f"<private for pub: {auth.public_key}>"
     _keys = []
     for k in int_keys:
-        if k == key:
+        if k is key or (k is not None and key is not None and k == key):
             continue
         _keys.append(f"<private for pub: {gen_public_key(k)}>" if k is not None else None)