Revert "Small refactor to cleanup unnecessary returns (#121653)" (#122756)

This commit is contained in:
epenet 2024-07-29 12:59:25 +02:00 committed by GitHub
parent cfef72ae57
commit 9e10126505
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 10 deletions

View File

@ -140,8 +140,10 @@ class HMThermostat(HMDevice, ClimateEntity):
def set_temperature(self, **kwargs: Any) -> None:
"""Set new target temperature."""
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is not None:
self._hmdevice.writeNodeData(self._state, float(temperature))
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
return None
self._hmdevice.writeNodeData(self._state, float(temperature))
def set_hvac_mode(self, hvac_mode: HVACMode) -> None:
"""Set new target hvac mode."""

View File

@ -227,9 +227,10 @@ class NestEventMediaStore(EventMediaStore):
filename = self.get_media_filename(media_key)
def remove_media(filename: str) -> None:
if os.path.exists(filename):
_LOGGER.debug("Removing event media from disk store: %s", filename)
os.remove(filename)
if not os.path.exists(filename):
return None
_LOGGER.debug("Removing event media from disk store: %s", filename)
os.remove(filename)
try:
await self._hass.async_add_executor_job(remove_media, filename)

View File

@ -142,9 +142,10 @@ class TelnetSwitch(SwitchEntity):
response = self._telnet_command(self._command_state)
if response and self._value_template:
rendered = self._value_template.render_with_possible_json_value(response)
self._attr_is_on = rendered == "True"
else:
_LOGGER.warning("Empty response for command: %s", self._command_state)
return None
self._attr_is_on = rendered == "True"
def turn_on(self, **kwargs: Any) -> None:
"""Turn the device on."""

View File

@ -72,10 +72,12 @@ class TradfriSwitch(TradfriBaseEntity, SwitchEntity):
async def async_turn_off(self, **kwargs: Any) -> None:
"""Instruct the switch to turn off."""
if self._device_control:
await self._api(self._device_control.set_state(False))
if not self._device_control:
return None
await self._api(self._device_control.set_state(False))
async def async_turn_on(self, **kwargs: Any) -> None:
"""Instruct the switch to turn on."""
if self._device_control:
await self._api(self._device_control.set_state(True))
if not self._device_control:
return None
await self._api(self._device_control.set_state(True))