From 48638e1ac7c9d378929b87f35b25491327a9dd94 Mon Sep 17 00:00:00 2001 From: matejcik Date: Mon, 20 Jan 2025 16:21:06 +0100 Subject: [PATCH] fixup! feat(python): allow `trezorctl firmware` commands to work with unknown models --- python/src/trezorlib/cli/firmware.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/python/src/trezorlib/cli/firmware.py b/python/src/trezorlib/cli/firmware.py index f50a638f21..923c20b3d6 100644 --- a/python/src/trezorlib/cli/firmware.py +++ b/python/src/trezorlib/cli/firmware.py @@ -92,18 +92,12 @@ def _print_firmware_model(hw_model: Union[bytes, fw_models.Model]) -> None: click.echo(f"{model_name} firmware image.") return except ValueError: - assert isinstance(hw_model, bytes) - if hw_model.isascii(): - model_name = hw_model.decode("ascii") - click.echo(f"Unrecognized hardware model: {model_name}") - return - else: - click.echo(f"Invalid model field: {hw_model.hex()}") + pass assert isinstance(hw_model, bytes) - if all(0x20 <= b < 0x80 for b in hw_model): # isascii + if hw_model.isascii(): model_name = hw_model.decode("ascii") - click.echo(f"Unknown hardware model: {model_name}") + click.echo(f"Unrecognized hardware model: {model_name}") return click.echo(f"Suspicious hardware model code: {hw_model.hex()} ({hw_model!r})")