From 30b5297fde14b43aa76f45b7f979605d7522ea21 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Wed, 10 Jul 2024 09:34:48 +0200
Subject: [PATCH] Small refactor to cleanup unnecessary returns (#121653)
---
homeassistant/components/homematic/climate.py | 6 ++----
homeassistant/components/nest/media_source.py | 7 +++----
homeassistant/components/telnet/switch.py | 3 +--
homeassistant/components/tradfri/switch.py | 10 ++++------
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/homeassistant/components/homematic/climate.py b/homeassistant/components/homematic/climate.py
index 16c345c5635..2b0306809b0 100644
--- a/homeassistant/components/homematic/climate.py
+++ b/homeassistant/components/homematic/climate.py
@@ -140,10 +140,8 @@ class HMThermostat(HMDevice, ClimateEntity):
def set_temperature(self, **kwargs: Any) -> None:
"""Set new target temperature."""
- if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
- return None
-
- self._hmdevice.writeNodeData(self._state, float(temperature))
+ if (temperature := kwargs.get(ATTR_TEMPERATURE)) is not None:
+ self._hmdevice.writeNodeData(self._state, float(temperature))
def set_hvac_mode(self, hvac_mode: HVACMode) -> None:
"""Set new target hvac mode."""
diff --git a/homeassistant/components/nest/media_source.py b/homeassistant/components/nest/media_source.py
index 6c481806e4f..1260474ad88 100644
--- a/homeassistant/components/nest/media_source.py
+++ b/homeassistant/components/nest/media_source.py
@@ -227,10 +227,9 @@ class NestEventMediaStore(EventMediaStore):
filename = self.get_media_filename(media_key)
def remove_media(filename: str) -> None:
- if not os.path.exists(filename):
- return None
- _LOGGER.debug("Removing event media from disk store: %s", filename)
- os.remove(filename)
+ if os.path.exists(filename):
+ _LOGGER.debug("Removing event media from disk store: %s", filename)
+ os.remove(filename)
try:
await self._hass.async_add_executor_job(remove_media, filename)
diff --git a/homeassistant/components/telnet/switch.py b/homeassistant/components/telnet/switch.py
index 805f037dbae..8aae49f8730 100644
--- a/homeassistant/components/telnet/switch.py
+++ b/homeassistant/components/telnet/switch.py
@@ -142,10 +142,9 @@ 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."""
diff --git a/homeassistant/components/tradfri/switch.py b/homeassistant/components/tradfri/switch.py
index 4ad1424aa9a..88126f1ffce 100644
--- a/homeassistant/components/tradfri/switch.py
+++ b/homeassistant/components/tradfri/switch.py
@@ -72,12 +72,10 @@ class TradfriSwitch(TradfriBaseEntity, SwitchEntity):
async def async_turn_off(self, **kwargs: Any) -> None:
"""Instruct the switch to turn off."""
- if not self._device_control:
- return None
- await self._api(self._device_control.set_state(False))
+ if self._device_control:
+ 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 not self._device_control:
- return None
- await self._api(self._device_control.set_state(True))
+ if self._device_control:
+ await self._api(self._device_control.set_state(True))
--
GitLab