From 184281d2fcf6a45a2e375b14a46fed4904b6b878 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Tue, 30 May 2023 22:54:26 +0000 Subject: [PATCH] version_info cmd: better version for hidapi was added in https://github.com/trezor/cython-hidapi/pull/143 --- electrum/plugin.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/electrum/plugin.py b/electrum/plugin.py index 12a8cbae6..0194fb1a2 100644 --- a/electrum/plugin.py +++ b/electrum/plugin.py @@ -786,11 +786,15 @@ class DeviceMgr(ThreadJob): except AttributeError: ret["libusb.path"] = None # add hidapi - from importlib.metadata import version try: - ret["hidapi.version"] = version("hidapi") # FIXME does not work in macOS binary - except ImportError: - ret["hidapi.version"] = None + import hid + ret["hidapi.version"] = hid.__version__ # available starting with 0.12.0.post2 + except Exception as e: + from importlib.metadata import version + try: + ret["hidapi.version"] = version("hidapi") + except ImportError: + ret["hidapi.version"] = None return ret def trigger_pairings(