arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-13 20:38:45 +00:00
Code Issues Releases Wiki Activity

python: don't use py3.6+ format strings yet

Browse Source
This commit is contained in:
Pavol Rusnak 2020-01-21 17:20:45 +01:00
parent 8a5242ed0f
commit a95405b693
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/src/trezorlib/_internal/firmware_headers.py
View File

@ -147,7 +147,7 @@ def _format_version(version: c.Container) -> str:
str(version[k]) for k in ("major", "minor", "patch") if k in version str(version[k]) for k in ("major", "minor", "patch") if k in version
) )
if "build" in version: if "build" in version:
version_str += f" build {version.build}" version_str += " build {}".format(version.build)
return version_str return version_str
@ -207,7 +207,7 @@ class VendorHeader(SignableImage):
vhash = compute_vhash(vh) vhash = compute_vhash(vh)
output = [ output = [
"Vendor Header " + _format_container(vh), "Vendor Header " + _format_container(vh),
f"Pubkey bundle hash: {vhash.hex()}", "Pubkey bundle hash: {}".format(vhash.hex()),
] ]
else: else:
output = [ output = [
@ -221,11 +221,13 @@ class VendorHeader(SignableImage):
fingerprint = firmware.header_digest(vh) fingerprint = firmware.header_digest(vh)
if not terse: if not terse:
output.append(f"Fingerprint: {click.style(fingerprint.hex(), bold=True)}") output.append(
"Fingerprint: {}".format(click.style(fingerprint.hex(), bold=True))
)
sig_status = self.check_signature() sig_status = self.check_signature()
sym = SYM_OK if sig_status.is_ok() else SYM_FAIL sym = SYM_OK if sig_status.is_ok() else SYM_FAIL
output.append(f"{sym} Signature is {sig_status.value}") output.append("{} Signature is {}".format(sym, sig_status.value))
return "\n".join(output) return "\n".join(output)
@ -271,7 +273,7 @@ class BinImage(SignableImage):
hashes_out = [] hashes_out = []
for expected, actual in zip(self.header.hashes, self.code_hashes): for expected, actual in zip(self.header.hashes, self.code_hashes):
status = SYM_OK if expected == actual else SYM_FAIL status = SYM_OK if expected == actual else SYM_FAIL
hashes_out.append(LiteralStr(f"{status} {expected.hex()}")) hashes_out.append(LiteralStr("{} {}".format(status, expected.hex())))
if all(all_zero(h) for h in self.header.hashes): if all(all_zero(h) for h in self.header.hashes):
hash_status = Status.MISSING hash_status = Status.MISSING
@ -287,8 +289,10 @@ class BinImage(SignableImage):
output = [ output = [
"Firmware Header " + _format_container(header_out), "Firmware Header " + _format_container(header_out),
f"Fingerprint: {click.style(self.digest().hex(), bold=True)}", "Fingerprint: {}".format(click.style(self.digest().hex(), bold=True)),
f"{all_ok} Signature is {sig_status.value}, hashes are {hash_status.value}", "{} Signature is {}, hashes are {}".format(
all_ok, sig_status.value, hash_status.value
),
] ]
return "\n".join(output) return "\n".join(output)