From bc115634d1b3207301cce6c98ee5b077e15bd1e3 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Wed, 18 Jan 2023 14:25:09 +0100 Subject: [PATCH] Remove unnecessary try-else (2) (#86159) --- .../components/enphase_envoy/__init__.py | 4 +-- homeassistant/components/everlights/light.py | 5 ++- .../components/flux_led/config_flow.py | 20 ++++++------ homeassistant/components/harmony/data.py | 4 +-- homeassistant/components/hassio/update.py | 4 +-- .../components/hlk_sw16/config_flow.py | 7 ++-- homeassistant/components/knx/__init__.py | 4 +-- .../components/konnected/config_flow.py | 32 +++++++++---------- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/homeassistant/components/enphase_envoy/__init__.py b/homeassistant/components/enphase_envoy/__init__.py index 61c2fd86c77..147eddacf81 100644 --- a/homeassistant/components/enphase_envoy/__init__.py +++ b/homeassistant/components/enphase_envoy/__init__.py @@ -78,8 +78,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: raise ConfigEntryNotReady( f"Could not obtain serial number from envoy: {ex}" ) from ex - else: - hass.config_entries.async_update_entry(entry, unique_id=serial) + + hass.config_entries.async_update_entry(entry, unique_id=serial) hass.data.setdefault(DOMAIN, {})[entry.entry_id] = { COORDINATOR: coordinator, diff --git a/homeassistant/components/everlights/light.py b/homeassistant/components/everlights/light.py index 3ef4627c089..1a177cf8909 100644 --- a/homeassistant/components/everlights/light.py +++ b/homeassistant/components/everlights/light.py @@ -65,9 +65,8 @@ async def async_setup_platform( except pyeverlights.ConnectionError as err: raise PlatformNotReady from err - else: - lights.append(EverLightsLight(api, pyeverlights.ZONE_1, status, effects)) - lights.append(EverLightsLight(api, pyeverlights.ZONE_2, status, effects)) + lights.append(EverLightsLight(api, pyeverlights.ZONE_1, status, effects)) + lights.append(EverLightsLight(api, pyeverlights.ZONE_2, status, effects)) async_add_entities(lights) diff --git a/homeassistant/components/flux_led/config_flow.py b/homeassistant/components/flux_led/config_flow.py index 4baebda516e..11e045bec70 100644 --- a/homeassistant/components/flux_led/config_flow.py +++ b/homeassistant/components/flux_led/config_flow.py @@ -155,16 +155,16 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): device = await self._async_try_connect(host, device) except FLUX_LED_EXCEPTIONS: return self.async_abort(reason="cannot_connect") - else: - discovered_mac = device[ATTR_ID] - if device[ATTR_MODEL_DESCRIPTION] or ( - discovered_mac is not None - and (formatted_discovered_mac := dr.format_mac(discovered_mac)) - and formatted_discovered_mac != mac - and mac_matches_by_one(discovered_mac, mac) - ): - self._discovered_device = device - await self._async_set_discovered_mac(device, True) + + discovered_mac = device[ATTR_ID] + if device[ATTR_MODEL_DESCRIPTION] or ( + discovered_mac is not None + and (formatted_discovered_mac := dr.format_mac(discovered_mac)) + and formatted_discovered_mac != mac + and mac_matches_by_one(discovered_mac, mac) + ): + self._discovered_device = device + await self._async_set_discovered_mac(device, True) return await self.async_step_discovery_confirm() async def async_step_discovery_confirm( diff --git a/homeassistant/components/harmony/data.py b/homeassistant/components/harmony/data.py index 33c0e3c5b5f..3cb87323c0b 100644 --- a/homeassistant/components/harmony/data.py +++ b/homeassistant/components/harmony/data.py @@ -275,5 +275,5 @@ class HarmonyData(HarmonySubscriberMixin): except aioexc.TimeOut: _LOGGER.error("%s: Syncing hub with Harmony cloud timed-out", self.name) return False - else: - return True + + return True diff --git a/homeassistant/components/hassio/update.py b/homeassistant/components/hassio/update.py index dcb2b18cdd3..285a2663d92 100644 --- a/homeassistant/components/hassio/update.py +++ b/homeassistant/components/hassio/update.py @@ -167,8 +167,8 @@ class SupervisorAddonUpdateEntity(HassioAddonEntity, UpdateEntity): await async_update_addon(self.hass, slug=self._addon_slug, backup=backup) except HassioAPIError as err: raise HomeAssistantError(f"Error updating {self.title}: {err}") from err - else: - await self.coordinator.force_info_update_supervisor() + + await self.coordinator.force_info_update_supervisor() class SupervisorOSUpdateEntity(HassioOSEntity, UpdateEntity): diff --git a/homeassistant/components/hlk_sw16/config_flow.py b/homeassistant/components/hlk_sw16/config_flow.py index ca65647a448..83389472607 100644 --- a/homeassistant/components/hlk_sw16/config_flow.py +++ b/homeassistant/components/hlk_sw16/config_flow.py @@ -44,6 +44,7 @@ async def validate_input(hass: HomeAssistant, user_input): client = await connect_client(hass, user_input) except asyncio.TimeoutError as err: raise CannotConnect from err + try: def disconnect_callback(): @@ -56,9 +57,9 @@ async def validate_input(hass: HomeAssistant, user_input): client.disconnect_callback = None client.stop() raise - else: - client.disconnect_callback = None - client.stop() + + client.disconnect_callback = None + client.stop() class SW16FlowHandler(config_entries.ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/knx/__init__.py b/homeassistant/components/knx/__init__.py index 0159f6f1cac..ac606856e3e 100644 --- a/homeassistant/components/knx/__init__.py +++ b/homeassistant/components/knx/__init__.py @@ -580,8 +580,8 @@ class KNXModule: raise HomeAssistantError( f"Could not find exposure for '{group_address}' to remove." ) from err - else: - removed_exposure.shutdown() + + removed_exposure.shutdown() return if group_address in self.service_exposures: diff --git a/homeassistant/components/konnected/config_flow.py b/homeassistant/components/konnected/config_flow.py index fcf94a38c18..c9889dd6464 100644 --- a/homeassistant/components/konnected/config_flow.py +++ b/homeassistant/components/konnected/config_flow.py @@ -191,11 +191,11 @@ class KonnectedFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): self.data[CONF_ID] = status.get("chipId", status["mac"].replace(":", "")) except (CannotConnect, KeyError) as err: raise CannotConnect from err - else: - self.data[CONF_MODEL] = status.get("model", KONN_MODEL) - self.data[CONF_ACCESS_TOKEN] = "".join( - random.choices(f"{string.ascii_uppercase}{string.digits}", k=20) - ) + + self.data[CONF_MODEL] = status.get("model", KONN_MODEL) + self.data[CONF_ACCESS_TOKEN] = "".join( + random.choices(f"{string.ascii_uppercase}{string.digits}", k=20) + ) async def async_step_import(self, device_config): """Import a configuration.yaml config. @@ -282,19 +282,17 @@ class KonnectedFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): status = await get_status(self.hass, netloc[0], int(netloc[1])) except CannotConnect: return self.async_abort(reason="cannot_connect") - else: - self.data[CONF_HOST] = netloc[0] - self.data[CONF_PORT] = int(netloc[1]) - self.data[CONF_ID] = status.get( - "chipId", status["mac"].replace(":", "") - ) - self.data[CONF_MODEL] = status.get("model", KONN_MODEL) - KonnectedFlowHandler.discovered_hosts[self.data[CONF_ID]] = { - CONF_HOST: self.data[CONF_HOST], - CONF_PORT: self.data[CONF_PORT], - } - return await self.async_step_confirm() + self.data[CONF_HOST] = netloc[0] + self.data[CONF_PORT] = int(netloc[1]) + self.data[CONF_ID] = status.get("chipId", status["mac"].replace(":", "")) + self.data[CONF_MODEL] = status.get("model", KONN_MODEL) + + KonnectedFlowHandler.discovered_hosts[self.data[CONF_ID]] = { + CONF_HOST: self.data[CONF_HOST], + CONF_PORT: self.data[CONF_PORT], + } + return await self.async_step_confirm() return self.async_abort(reason="unknown")