From 21275669d56aab1f0e76a83ab87a5e11b8166e4f Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Wed, 22 Jun 2022 03:00:58 +0200
Subject: [PATCH] Fix inheritance in zha general channel (#73774)

Fix general channel type hints in zha
---
 homeassistant/components/zha/core/channels/general.py | 5 +++--
 mypy.ini                                              | 3 ---
 script/hassfest/mypy_config.py                        | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/zha/core/channels/general.py b/homeassistant/components/zha/core/channels/general.py
index 8886085bf47..b2870d84e15 100644
--- a/homeassistant/components/zha/core/channels/general.py
+++ b/homeassistant/components/zha/core/channels/general.py
@@ -408,9 +408,9 @@ class OnOffConfiguration(ZigbeeChannel):
     """OnOff Configuration channel."""
 
 
-@registries.CLIENT_CHANNELS_REGISTRY.register(general.Ota.cluster_id)
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(general.Ota.cluster_id)
-class Ota(ZigbeeChannel):
+@registries.CLIENT_CHANNELS_REGISTRY.register(general.Ota.cluster_id)
+class Ota(ClientChannel):
     """OTA Channel."""
 
     BIND: bool = False
@@ -427,6 +427,7 @@ class Ota(ZigbeeChannel):
 
         signal_id = self._ch_pool.unique_id.split("-")[0]
         if cmd_name == "query_next_image":
+            assert args
             self.async_send_signal(SIGNAL_UPDATE_DEVICE.format(signal_id), args[3])
 
 
diff --git a/mypy.ini b/mypy.ini
index 98884d333e7..b01acbe311f 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -2997,9 +2997,6 @@ ignore_errors = true
 [mypy-homeassistant.components.zha.core.channels.base]
 ignore_errors = true
 
-[mypy-homeassistant.components.zha.core.channels.general]
-ignore_errors = true
-
 [mypy-homeassistant.components.zha.core.channels.homeautomation]
 ignore_errors = true
 
diff --git a/script/hassfest/mypy_config.py b/script/hassfest/mypy_config.py
index b519e7f2daf..e5bb404b715 100644
--- a/script/hassfest/mypy_config.py
+++ b/script/hassfest/mypy_config.py
@@ -148,7 +148,6 @@ IGNORED_MODULES: Final[list[str]] = [
     "homeassistant.components.zha.button",
     "homeassistant.components.zha.climate",
     "homeassistant.components.zha.core.channels.base",
-    "homeassistant.components.zha.core.channels.general",
     "homeassistant.components.zha.core.channels.homeautomation",
     "homeassistant.components.zha.core.channels.hvac",
     "homeassistant.components.zha.core.channels.security",