From 12450daf562f055d575dd4cb930182752dbcee34 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 4 Jan 2022 12:51:45 +0100 Subject: [PATCH] Only rely on device status when adding Tuya entities (#63074) --- homeassistant/components/tuya/button.py | 2 +- homeassistant/components/tuya/cover.py | 5 +---- homeassistant/components/tuya/light.py | 5 +---- homeassistant/components/tuya/number.py | 5 +---- homeassistant/components/tuya/select.py | 5 +---- homeassistant/components/tuya/sensor.py | 5 +---- homeassistant/components/tuya/siren.py | 5 +---- homeassistant/components/tuya/switch.py | 5 +---- 8 files changed, 8 insertions(+), 29 deletions(-) diff --git a/homeassistant/components/tuya/button.py b/homeassistant/components/tuya/button.py index cd410db24cc..f8cfe36cf91 100644 --- a/homeassistant/components/tuya/button.py +++ b/homeassistant/components/tuya/button.py @@ -70,7 +70,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := BUTTONS.get(device.category): for description in descriptions: - if description.key in device.function: + if description.key in device.status: entities.append( TuyaButtonEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/cover.py b/homeassistant/components/tuya/cover.py index 2d18e947a06..c0a1639a77e 100644 --- a/homeassistant/components/tuya/cover.py +++ b/homeassistant/components/tuya/cover.py @@ -157,10 +157,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := COVERS.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaCoverEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/light.py b/homeassistant/components/tuya/light.py index 804daa76e50..1459ef94fa9 100644 --- a/homeassistant/components/tuya/light.py +++ b/homeassistant/components/tuya/light.py @@ -301,10 +301,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := LIGHTS.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaLightEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/number.py b/homeassistant/components/tuya/number.py index f75f21dc57f..4a13db72976 100644 --- a/homeassistant/components/tuya/number.py +++ b/homeassistant/components/tuya/number.py @@ -247,10 +247,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := NUMBERS.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaNumberEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/select.py b/homeassistant/components/tuya/select.py index ca05acbb3e5..33ec8da5d1a 100644 --- a/homeassistant/components/tuya/select.py +++ b/homeassistant/components/tuya/select.py @@ -273,10 +273,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := SELECTS.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaSelectEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/sensor.py b/homeassistant/components/tuya/sensor.py index 07393b636e8..4aa88294bda 100644 --- a/homeassistant/components/tuya/sensor.py +++ b/homeassistant/components/tuya/sensor.py @@ -662,10 +662,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := SENSORS.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaSensorEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/siren.py b/homeassistant/components/tuya/siren.py index bfdca70ac25..ae38149da2b 100644 --- a/homeassistant/components/tuya/siren.py +++ b/homeassistant/components/tuya/siren.py @@ -52,10 +52,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := SIRENS.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaSirenEntity( device, hass_data.device_manager, description diff --git a/homeassistant/components/tuya/switch.py b/homeassistant/components/tuya/switch.py index 17b0feb70a7..c8cd12c94b4 100644 --- a/homeassistant/components/tuya/switch.py +++ b/homeassistant/components/tuya/switch.py @@ -486,10 +486,7 @@ async def async_setup_entry( device = hass_data.device_manager.device_map[device_id] if descriptions := SWITCHES.get(device.category): for description in descriptions: - if ( - description.key in device.function - or description.key in device.status - ): + if description.key in device.status: entities.append( TuyaSwitchEntity( device, hass_data.device_manager, description