arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

fix(python): fix result_callback correctly this time

Browse Source
This commit is contained in:
matejcik 2022-07-13 15:11:32 +02:00
parent 9f69057b9b
commit ff85e0f92d
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix Click 7.x compatibility.

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

@ -123,11 +123,27 @@ class TrezorctlGroup(AliasedGroup):
return None return None
def result_callback(self, replace: bool = False) -> Callable[[F], F]: def set_result_callback(self) -> Callable[[F], F]:
"""Compatibility wrapper for Click 7.x""" """Set a function called to format the return value of a command.
if hasattr(self, "result_callback"):
return super().result_callback(replace) Compatibility wrapper for Click 7.x `resultcallback` and >=8.1 `result_callback`
return super().resultcallback(replace) # type: ignore [Cannot access member] """
# Click 7.x uses `resultcallback` to configure the callback, and
# `result_callback` to store its value.
# Click 8.x uses `result_callback` to configure the callback, and
# `_result_callback` to store its value.
# Click 8.0 has a `resultcallback` function that emits a warning and delegates
# to `result_callback`. Click 8.1 removes this function.
#
# This means that there is no reasonable way to use `hasattr` to detect where we
# are, unless we want to look at the private `_result_callback` attribute.
# Instead, we look at Click version and hope for the best.
from click import __version__ as click_version
if click_version.startswith("7."):
return super().resultcallback() # type: ignore [Cannot access member]
else:
return super().result_callback()
def configure_logging(verbose: int) -> None: def configure_logging(verbose: int) -> None:
@ -197,7 +213,7 @@ def cli_main(
cli = cast(TrezorctlGroup, cli_main) cli = cast(TrezorctlGroup, cli_main)
@cli.result_callback() @cli.set_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):