mirror of
https://github.com/home-assistant/core.git
synced 2025-07-24 21:57:51 +00:00
Remove unnecessary try-else (2) (#86159)
This commit is contained in:
parent
1cc8feabb7
commit
bc115634d1
@ -78,7 +78,7 @@ 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.data.setdefault(DOMAIN, {})[entry.entry_id] = {
|
||||
|
@ -65,7 +65,6 @@ 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))
|
||||
|
||||
|
@ -155,7 +155,7 @@ 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
|
||||
|
@ -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
|
||||
|
@ -167,7 +167,7 @@ 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()
|
||||
|
||||
|
||||
|
@ -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,7 +57,7 @@ async def validate_input(hass: HomeAssistant, user_input):
|
||||
client.disconnect_callback = None
|
||||
client.stop()
|
||||
raise
|
||||
else:
|
||||
|
||||
client.disconnect_callback = None
|
||||
client.stop()
|
||||
|
||||
|
@ -580,7 +580,7 @@ class KNXModule:
|
||||
raise HomeAssistantError(
|
||||
f"Could not find exposure for '{group_address}' to remove."
|
||||
) from err
|
||||
else:
|
||||
|
||||
removed_exposure.shutdown()
|
||||
return
|
||||
|
||||
|
@ -191,7 +191,7 @@ 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)
|
||||
@ -282,12 +282,10 @@ 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_ID] = status.get("chipId", status["mac"].replace(":", ""))
|
||||
self.data[CONF_MODEL] = status.get("model", KONN_MODEL)
|
||||
|
||||
KonnectedFlowHandler.discovered_hosts[self.data[CONF_ID]] = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user