Tighten ruff rules

Author: penguinolog

exec_helpers/_ssh_base.py

@@ -1884,9 +1884,10 @@ def exists(self, path: SupportPathT) -> bool:
         """
         try:
             self._sftp.lstat(pathlib.PurePath(path).as_posix())
-            return True
         except OSError:
             return False
+        else:
+            return True
 
     def stat(self, path: SupportPathT) -> paramiko.sftp_attr.SFTPAttributes:
         """Get stat info for path with following symlinks.

exec_helpers/_ssh_helpers.py

@@ -43,9 +43,10 @@ def _parse_ssh_config_file(file_path: pathlib.Path) -> paramiko.SSHConfig | None
         config = paramiko.SSHConfig()
         with file_path.open() as f_obj:
             config.parse(f_obj)
-        return config
     except Exception:
-        return None
+        config = None
+
+    return config
 
 
 class SSHConfig:

exec_helpers/async_api/subprocess.py

@@ -331,7 +331,6 @@ async def poll_stderr() -> None:
             # Wait real timeout here
             exit_code: int = await asyncio.wait_for(async_result.interface.wait(), timeout=timeout)
             result.exit_code = exit_code
-            return result
         except asyncio.TimeoutError as exc:
             # kill -9 for all subprocesses
             _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
@@ -342,6 +341,8 @@ async def poll_stderr() -> None:
                     timeout=timeout,  # type: ignore[arg-type]
                 ) from exc
             result.exit_code = exit_signal
+        else:
+            return result
         finally:
             stdout_task.cancel()
             stderr_task.cancel()

exec_helpers/ssh_auth.py

@@ -204,7 +204,6 @@ def connect(
                 if index != self.__key_index:
                     self.__key_index = index
                     LOGGER.debug(f"Main key has been updated, public key is: \n{self.public_key}")
-                return
             except paramiko.PasswordRequiredException:
                 if self.__password is None:
                     LOGGER.exception("No password has been set!")
@@ -213,6 +212,8 @@ def connect(
                 raise
             except (paramiko.AuthenticationException, paramiko.BadHostKeyException):
                 continue
+            else:
+                return
         msg: str = "Connection using stored authentication info failed!"
         if log:
             LOGGER.exception(msg)

exec_helpers/subprocess.py

@@ -346,7 +346,6 @@ def close_streams() -> None:
                 # Minimal timeout to complete polling
                 concurrent.futures.wait([stdout_future, stderr_future], timeout=0.1)
                 result.exit_code = exit_code
-                return result
             except subprocess.TimeoutExpired as exc:
                 # kill -9 for all subprocesses
                 _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
@@ -357,6 +356,8 @@ def close_streams() -> None:
                         timeout=timeout,  # type: ignore[arg-type]
                     ) from exc
                 result.exit_code = exit_signal
+            else:
+                return result
             finally:
                 stdout_future.cancel()
                 stderr_future.cancel()

pyproject.toml

@@ -190,7 +190,7 @@ extend-ignore = [
   "PLR0911", "PLR0912", "PLR0913", "PLR0915", "PLR2004",  # refactor rules (too many statements/arguments/branches)
   "RET504",  # Unnecessary variable assignment before return statement
   "SIM108",  # Use ternary operator,
-  "TRY002", "TRY003", "TRY300", "TRY301", "TRY400",  # do not raise `Exception`, long messages prepare outside, ...
+  "TRY003",  # long messages prepare outside, ...
   "PTH118", "PTH119",  # `os.path.join()`, `os.path.basename()` should be replaced
 ]
 

tox.ini

@@ -117,7 +117,6 @@ deps =
   -r{toxinidir}/mypy_requirements.txt
   -r{toxinidir}/CI_REQUIREMENTS.txt
 commands =
-  python setup.py --version clean
   mypy --install-types --non-interactive --xslt-html-report mypy_report -p exec_helpers
 
 [testenv:isort]