From b67b8c8ad3fc5c15dd003b1e5eea3596cb8bcbc5 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 1 Feb 2023 16:33:03 +0200 Subject: [PATCH] Whitespace changes to make new black linter happy Signed-off-by: Jussi Kukkonen --- examples/manual_repo/hashed_bin_delegation.py | 1 + tests/test_api.py | 2 -- tests/test_trusted_metadata_set.py | 2 ++ tests/test_updater_key_rotations.py | 1 - tests/test_updater_top_level_update.py | 1 - tests/utils.py | 2 +- tuf/api/metadata.py | 2 -- tuf/ngclient/_internal/requests_fetcher.py | 1 + tuf/ngclient/updater.py | 2 -- 9 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/manual_repo/hashed_bin_delegation.py b/examples/manual_repo/hashed_bin_delegation.py index eb2d81d7..a16c72ee 100644 --- a/examples/manual_repo/hashed_bin_delegation.py +++ b/examples/manual_repo/hashed_bin_delegation.py @@ -78,6 +78,7 @@ def _in(days: float) -> datetime: BIN_SIZE = NUMBER_OF_PREFIXES // NUMBER_OF_BINS # ... 8, where each bin is # responsible for a range of 8 prefixes, i.e. 00-07, 08-0f, ..., f8-ff. + # Helpers # ------- def _bin_name(low: int, high: int) -> str: diff --git a/tests/test_api.py b/tests/test_api.py index 3ea782e7..fde1617f 100755 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -100,7 +100,6 @@ def test_generic_read(self) -> None: (Timestamp.type, Timestamp), (Targets.type, Targets), ]: - # Load JSON-formatted metdata of each supported type from file # and from out-of-band read JSON string path = os.path.join(self.repo_dir, "metadata", metadata + ".json") @@ -613,7 +612,6 @@ def test_targets_key_api_with_succinct_roles(self) -> None: targets.revoke_key(key.keyid) def test_length_and_hash_validation(self) -> None: - # Test metadata files' hash and length verification. # Use timestamp to get a MetaFile object and snapshot # for untrusted metadata file to verify. diff --git a/tests/test_trusted_metadata_set.py b/tests/test_trusted_metadata_set.py index d6ef50f3..5f6732aa 100644 --- a/tests/test_trusted_metadata_set.py +++ b/tests/test_trusted_metadata_set.py @@ -27,6 +27,7 @@ logger = logging.getLogger(__name__) + # pylint: disable=too-many-public-methods class TestTrustedMetadataSet(unittest.TestCase): """Tests for all public API of the TrustedMetadataSet class.""" @@ -459,6 +460,7 @@ def meta_modifier(snapshot: Snapshot) -> None: def test_update_targets_expired_new_target(self) -> None: self._update_all_besides_targets() + # new_delegated_target has expired def target_expired_modifier(target: Targets) -> None: target.expires = datetime(1970, 1, 1) diff --git a/tests/test_updater_key_rotations.py b/tests/test_updater_key_rotations.py index 83fc7fcf..7bfc77ad 100644 --- a/tests/test_updater_key_rotations.py +++ b/tests/test_updater_key_rotations.py @@ -247,7 +247,6 @@ def test_non_root_rotations(self, md_version: MdVersion) -> None: self.setup_subtest() roles = ["timestamp", "snapshot", "targets"] for role in roles: - # clear role keys, signers self.sim.root.roles[role].keyids.clear() self.sim.signers[role].clear() diff --git a/tests/test_updater_top_level_update.py b/tests/test_updater_top_level_update.py index be6ce09d..b5abb377 100644 --- a/tests/test_updater_top_level_update.py +++ b/tests/test_updater_top_level_update.py @@ -698,7 +698,6 @@ def test_snapshot_rollback_with_local_snapshot_hash_mismatch(self) -> None: @patch.object(builtins, "open", wraps=builtins.open) def test_load_metadata_from_cache(self, wrapped_open: MagicMock) -> None: - # Add new delegated targets spec_version = ".".join(SPECIFICATION_VERSION) targets = Targets(1, spec_version, self.sim.safe_expiry, {}, None) diff --git a/tests/utils.py b/tests/utils.py index 5bd67c6c..45deae8b 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -46,6 +46,7 @@ # DataSet is only here so type hints can be used. DataSet = Dict[str, Any] + # Test runner decorator: Runs the test as a set of N SubTests, # (where N is number of items in dataset), feeding the actual test # function one test case at a time @@ -187,7 +188,6 @@ def __init__( popen_cwd: str = ".", extra_cmd_args: Optional[List[str]] = None, ): - self.server = server self.__logger = log # Stores popped messages from the queue. diff --git a/tuf/api/metadata.py b/tuf/api/metadata.py index b2e64ddf..c21fc3eb 100644 --- a/tuf/api/metadata.py +++ b/tuf/api/metadata.py @@ -927,7 +927,6 @@ def __init__( hashes: Optional[Dict[str, str]] = None, unrecognized_fields: Optional[Dict[str, Any]] = None, ): - if version <= 0: raise ValueError(f"Metafile version must be > 0, got {version}") if length is not None: @@ -1601,7 +1600,6 @@ def __init__( path: str, unrecognized_fields: Optional[Dict[str, Any]] = None, ): - self._validate_length(length) self._validate_hashes(hashes) diff --git a/tuf/ngclient/_internal/requests_fetcher.py b/tuf/ngclient/_internal/requests_fetcher.py index 0080cbb9..f68fd368 100644 --- a/tuf/ngclient/_internal/requests_fetcher.py +++ b/tuf/ngclient/_internal/requests_fetcher.py @@ -22,6 +22,7 @@ # Globals logger = logging.getLogger(__name__) + # Classes class RequestsFetcher(FetcherInterface): """An implementation of ``FetcherInterface`` based on the requests library. diff --git a/tuf/ngclient/updater.py b/tuf/ngclient/updater.py index cf93219e..e06eb160 100644 --- a/tuf/ngclient/updater.py +++ b/tuf/ngclient/updater.py @@ -428,7 +428,6 @@ def _preorder_depth_first_walk( len(visited_role_names) <= self.config.max_delegations and len(delegations_to_visit) > 0 ): - # Pop the role name from the top of the stack. role_name, parent_role = delegations_to_visit.pop(-1) @@ -458,7 +457,6 @@ def _preorder_depth_first_walk( child_name, terminating, ) in targets.delegations.get_roles_for_target(target_filepath): - logger.debug("Adding child role %s", child_name) child_roles_to_visit.append((child_name, role_name)) if terminating: