Skip to content

Commit

Permalink
[client rework]: Fix various pylint issues
Browse files Browse the repository at this point in the history
Fix linter issues after applying the api/pylintrc config.

Signed-off-by: Teodora Sechkova <tsechkova@vmware.com>
  • Loading branch information
sechkova committed Mar 23, 2021
1 parent c888e4a commit e68eb9c
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 65 deletions.
15 changes: 8 additions & 7 deletions tuf/client_rework/metadata_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,19 @@ def __init__(self, meta):
def from_json_object(cls, tmp_file):
"""Loads JSON-formatted TUF metadata from a file object."""
raw_data = tmp_file.read()

# Use local scope import to avoid circular import errors
# pylint: disable=import-outside-toplevel
from tuf.api.serialization.json import JSONDeserializer

deserializer = JSONDeserializer()
_meta = deserializer.deserialize(raw_data)
return cls(meta=_meta)
meta = deserializer.deserialize(raw_data)
return cls(meta=meta)

@classmethod
def from_json_file(cls, filename):
"""Loads JSON-formatted TUF metadata from a file."""
_meta = metadata.Metadata.from_file(filename)
return cls(meta=_meta)
meta = metadata.Metadata.from_file(filename)
return cls(meta=meta)

@property
def signed(self):
Expand Down Expand Up @@ -97,7 +98,7 @@ def keys(self, role):
keys = []
for keyid in self._meta.signed.roles[role]["keyids"]:
key_metadata = self._meta.signed.keys[keyid]
key, _ = format_metadata_to_key(key_metadata)
key, dummy = format_metadata_to_key(key_metadata)
keys.append(key)

return keys
Expand Down Expand Up @@ -162,7 +163,7 @@ def keys(self, role):
if delegation["name"] == role:
for keyid in delegation["keyids"]:
key_metadata = self._meta.signed.delegations["keys"][keyid]
key, _ = format_metadata_to_key(key_metadata)
key, dummy = format_metadata_to_key(key_metadata)
keys.append(key)
return keys

Expand Down
Loading

0 comments on commit e68eb9c

Please sign in to comment.