Merge pull request #2588 from jku/some-more-linters

linter: Enable more rulesets

examples/uploader/_localrepo.py

@@ -3,6 +3,7 @@
 
 """A Repository implementation for maintainer and developer tools"""
 
+import contextlib
 import copy
 import json
 import logging
@@ -94,12 +95,10 @@ def add_target(self, role: str, targetpath: str) -> bool:
 
         # HACK: make sure we have the roles metadata in updater._trusted_set
         # (or that we're publishing the first version)
-        try:
+        # HACK: Assume RepositoryError is because we're just publishing version
+        # 1 (so the roles metadata does not exist on server yet)
+        with contextlib.suppress(RepositoryError):
             self.updater.get_targetinfo(targetpath)
-        except RepositoryError:
-            # HACK Assume this is because we're just publishing version 1
-            # (so the roles metadata does not exist on server yet)
-            pass
 
         data = bytes(targetpath, "utf-8")
         targetfile = TargetFile.from_data(targetpath, data)

pyproject.toml

@@ -82,6 +82,7 @@ line-length=80
 
 [tool.ruff.lint]
 select = [
+    "A",   # flake8-builtins
     "B",   # flake8-bugbear
     "D",   # pydocstyle
     "DTZ", # flake8-datetimez
@@ -90,7 +91,10 @@ select = [
     "I",   # isort
     "N",   # pep8-naming
     "PL",  # pylint
+    "RET", # flake8-return
     "S",   # flake8-bandit
+    "SIM", # flake8-simplify
+    "W",   # pycodestyle-warning
 ] 
 ignore = ["D400","D415","D213","D205","D202","D107","D407","D413","D212","D104","D406","D105","D411","D401","D200","D203", "PLR0913", "PLR2004"]
 

tests/test_api.py

@@ -676,7 +676,7 @@ def test_key_class(self) -> None:
         # of a securesystemslib key dictionary.
         sslib_key = generate_ed25519_key()
         key = SSlibKey.from_securesystemslib_key(sslib_key)
-        self.assertFalse("private" in key.keyval.keys())
+        self.assertFalse("private" in key.keyval)
 
     def test_root_add_key_and_revoke_key(self) -> None:
         root_path = os.path.join(self.repo_dir, "metadata", "root.json")

tests/test_updater_fetch_target.py

@@ -60,14 +60,13 @@ def _init_updater(self) -> Updater:
         if self.sim.dump_dir is not None:
             self.sim.write()
 
-        updater = Updater(
+        return Updater(
             self.metadata_dir,
             "https://example.com/metadata/",
             self.targets_dir,
             "https://example.com/targets/",
             self.sim,
         )
-        return updater
 
     targets: utils.DataSet = {
         "standard case": TestTarget(

tests/test_updater_top_level_update.py

@@ -336,11 +336,11 @@ def test_expired_timestamp_version_rollback(self, mock_time: Mock) -> None:
         mock_time.now.return_value = datetime.datetime.now(
             timezone.utc
         ) + datetime.timedelta(days=18)
-        with patch("datetime.datetime", mock_time):
-            # Check that a rollback protection is performed even if
-            # local timestamp has expired
-            with self.assertRaises(BadVersionNumberError):
-                self._run_refresh()
+        patcher = patch("datetime.datetime", mock_time)
+        # Check that a rollback protection is performed even if
+        # local timestamp has expired
+        with patcher, self.assertRaises(BadVersionNumberError):
+            self._run_refresh()
 
         self._assert_version_equals(Timestamp.type, 2)
 
@@ -375,11 +375,11 @@ def test_expired_timestamp_snapshot_rollback(self, mock_time: Mock) -> None:
         mock_time.now.return_value = datetime.datetime.now(
             timezone.utc
         ) + datetime.timedelta(days=18)
-        with patch("datetime.datetime", mock_time):
-            # Assert that rollback protection is done even if
-            # local timestamp has expired
-            with self.assertRaises(BadVersionNumberError):
-                self._run_refresh()
+        patcher = patch("datetime.datetime", mock_time)
+        # Assert that rollback protection is done even if
+        # local timestamp has expired
+        with patcher, self.assertRaises(BadVersionNumberError):
+            self._run_refresh()
 
         self._assert_version_equals(Timestamp.type, 3)
 

tests/utils.py

@@ -361,4 +361,4 @@ def clean(self) -> None:
 
     def is_process_running(self) -> bool:
         assert isinstance(self.__server_process, subprocess.Popen)
-        return True if self.__server_process.poll() is None else False
+        return self.__server_process.poll() is None

tuf/ngclient/updater.py

@@ -37,6 +37,7 @@
 <https://github.com/theupdateframework/python-tuf/tree/develop/examples/client>`_.
 """
 
+import contextlib
 import logging
 import os
 import shutil
@@ -299,10 +300,8 @@ def _persist_metadata(self, rolename: str, data: bytes) -> None:
             # remove tempfile if we managed to create one,
             # then let the exception happen
             if temp_file_name is not None:
-                try:
+                with contextlib.suppress(FileNotFoundError):
                     os.remove(temp_file_name)
-                except FileNotFoundError:
-                    pass
             raise e
 
     def _load_root(self) -> None: