arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-02 19:40:57 +00:00
Code Issues Releases Wiki Activity

fix(python): click 8.1 compatibility

Browse Source 
fixes #2199
This commit is contained in:
matejcik 2022-06-21 12:02:12 +02:00
parent 2fb4e5de5c
commit 5173cd3b82
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/.changelog.d/2199.fixed Normal file
View File

@ -0,0 +1 @@
Add compatibility with Click 8.1

12
python/src/trezorlib/cli/trezorctl.py
View File

@ -20,7 +20,7 @@ import json
import logging import logging
import os import os
import time import time
from typing import TYPE_CHECKING, Any, Iterable, Optional, cast from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional, TypeVar, cast
import click import click
@ -51,6 +51,8 @@ from . import (
with_client, with_client,
) )
F = TypeVar("F", bound=Callable)
if TYPE_CHECKING: if TYPE_CHECKING:
from ..transport import Transport from ..transport import Transport
@ -121,6 +123,12 @@ class TrezorctlGroup(AliasedGroup):
return None return None
def result_callback(self, replace: bool = False) -> Callable[[F], F]:
"""Compatibility wrapper for Click 7.x"""
if hasattr(self, "result_callback"):
return super().result_callback(replace)
return super().resultcallback(replace) # type: ignore [Cannot access member]
def configure_logging(verbose: int) -> None: def configure_logging(verbose: int) -> None:
if verbose: if verbose:
@ -189,7 +197,7 @@ def cli_main(
cli = cast(TrezorctlGroup, cli_main) cli = cast(TrezorctlGroup, cli_main)
@cli.resultcallback() @cli.result_callback()
def print_result(res: Any, is_json: bool, script: bool, **kwargs: Any) -> None: def print_result(res: Any, is_json: bool, script: bool, **kwargs: Any) -> None:
if is_json: if is_json:
if isinstance(res, protobuf.MessageType): if isinstance(res, protobuf.MessageType):