From e3587298c84b1596709eb78d131643da5e2cbf2b Mon Sep 17 00:00:00 2001 From: mdeweerd Date: Thu, 10 Mar 2022 19:01:44 +0100 Subject: [PATCH 1/2] Fix zigpy_deconz import --- custom_components/zha_toolkit/utils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/custom_components/zha_toolkit/utils.py b/custom_components/zha_toolkit/utils.py index b217908..0708af0 100644 --- a/custom_components/zha_toolkit/utils.py +++ b/custom_components/zha_toolkit/utils.py @@ -175,9 +175,9 @@ def get_radio_version(app): if hasattr(app, "_api"): rt = get_radiotype(app) if rt == RadioType.DECONZ: - import deconz + import zigpy_deconz - return deconz.__version__ + return zigpy_deconz.__version__ if rt == RadioType.ZIGATE: import zigpy_zigate @@ -186,10 +186,9 @@ def get_radio_version(app): import zigpy_xbee return zigpy_xbee.__version__ - if rt == RadioType.ZIGPY_CC: - import zigpy_cc - - return zigpy_cc.__version__ + # if rt == RadioType.ZIGPY_CC: + # import zigpy_cc + # return zigpy_cc.__version__ LOGGER.debug("Type recognition for '%s' not implemented", type(app)) return None From f4c819d11f8949b087e56f6f176394c5d740585f Mon Sep 17 00:00:00 2001 From: mdeweerd Date: Thu, 10 Mar 2022 19:05:31 +0100 Subject: [PATCH 2/2] Disable zigpy_cc - not found in ha --- custom_components/zha_toolkit/utils.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/custom_components/zha_toolkit/utils.py b/custom_components/zha_toolkit/utils.py index 0708af0..a4f797d 100644 --- a/custom_components/zha_toolkit/utils.py +++ b/custom_components/zha_toolkit/utils.py @@ -140,13 +140,12 @@ def get_radiotype(app): except Exception: # nosec pass - try: - from zigpy_cc.api import API - - if isinstance(app._api, API): - return RadioType.ZIGPY_CC - except Exception: # nosec - pass + # try: + # from zigpy_cc.api import API + # if isinstance(app._api, API): + # return RadioType.ZIGPY_CC + # except Exception: # nosec + # pass LOGGER.debug("Type recognition for '%s' not implemented", type(app)) return RadioType.UNKNOWN