diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py index c356af62509..3602f9585af 100644 --- a/homeassistant/components/tuya/__init__.py +++ b/homeassistant/components/tuya/__init__.py @@ -46,10 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN] = {entry.entry_id: {TUYA_HA_TUYA_MAP: {}, TUYA_HA_DEVICES: set()}} success = await _init_tuya_sdk(hass, entry) - if not success: - return False - - return True + return bool(success) async def _init_tuya_sdk(hass: HomeAssistant, entry: ConfigEntry) -> bool: diff --git a/homeassistant/components/tuya/base.py b/homeassistant/components/tuya/base.py index 86a508a8180..a1f65227e95 100644 --- a/homeassistant/components/tuya/base.py +++ b/homeassistant/components/tuya/base.py @@ -24,10 +24,9 @@ class TuyaHaEntity(Entity): @staticmethod def remap(old_value, old_min, old_max, new_min, new_max): """Remap old_value to new_value.""" - new_value = ((old_value - old_min) / (old_max - old_min)) * ( + return ((old_value - old_min) / (old_max - old_min)) * ( new_max - new_min ) + new_min - return new_value @property def should_poll(self) -> bool: @@ -47,13 +46,12 @@ class TuyaHaEntity(Entity): @property def device_info(self): """Return a device description for device registry.""" - _device_info = { + return { "identifiers": {(DOMAIN, f"{self.tuya_device.id}")}, "manufacturer": "Tuya", "name": self.tuya_device.name, "model": self.tuya_device.product_name, } - return _device_info @property def available(self) -> bool: diff --git a/homeassistant/components/tuya/climate.py b/homeassistant/components/tuya/climate.py index 368a65b8499..810e8ad8aab 100644 --- a/homeassistant/components/tuya/climate.py +++ b/homeassistant/components/tuya/climate.py @@ -430,10 +430,10 @@ class TuyaHaClimate(TuyaHaEntity, ClimateEntity): @property def fan_modes(self) -> list[str]: """Return fan modes for select.""" - data = json.loads( - self.tuya_device.function.get(DPCODE_FAN_SPEED_ENUM, {}).values - ).get("range") - return data + fan_speed_device_function = self.tuya_device.function.get(DPCODE_FAN_SPEED_ENUM) + if not fan_speed_device_function: + return [] + return json.loads(fan_speed_device_function.values).get("range", []) @property def swing_mode(self) -> str: diff --git a/homeassistant/components/tuya/light.py b/homeassistant/components/tuya/light.py index 180e3a68450..6a119e71ba9 100644 --- a/homeassistant/components/tuya/light.py +++ b/homeassistant/components/tuya/light.py @@ -299,7 +299,7 @@ class TuyaHaLight(TuyaHaEntity, LightEntity): """Return the color_temp of the light.""" new_range = self._tuya_temp_range() tuya_color_temp = self.tuya_device.status.get(self.dp_code_temp, 0) - ha_color_temp = ( + return ( self.max_mireds - self.remap( tuya_color_temp, @@ -310,7 +310,6 @@ class TuyaHaLight(TuyaHaEntity, LightEntity): ) + self.min_mireds ) - return ha_color_temp @property def min_mireds(self) -> int: diff --git a/homeassistant/components/tuya/scene.py b/homeassistant/components/tuya/scene.py index c6010f9ef87..c90c6798b9b 100644 --- a/homeassistant/components/tuya/scene.py +++ b/homeassistant/components/tuya/scene.py @@ -20,14 +20,9 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up tuya scenes.""" - entities = [] - home_manager = hass.data[DOMAIN][entry.entry_id][TUYA_HOME_MANAGER] scenes = await hass.async_add_executor_job(home_manager.query_scenes) - for scene in scenes: - entities.append(TuyaHAScene(home_manager, scene)) - - async_add_entities(entities) + async_add_entities(TuyaHAScene(home_manager, scene) for scene in scenes) class TuyaHAScene(Scene):