Remove unnecessary try-else (5) (#86164)

This commit is contained in:
Marc Mueller 2023-01-18 14:10:13 +01:00 committed by GitHub
parent d26484d482
commit 6d336ec136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 29 deletions

View file

@ -51,8 +51,8 @@ class FlickConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
raise CannotConnect() from err raise CannotConnect() from err
except AuthException as err: except AuthException as err:
raise InvalidAuth() from err raise InvalidAuth() from err
else:
return token is not None return token is not None
async def async_step_user(self, user_input=None): async def async_step_user(self, user_input=None):
"""Handle gathering login info.""" """Handle gathering login info."""

View file

@ -136,9 +136,9 @@ class GitHubDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
# These are unexpected and we log the trace to help with troubleshooting # These are unexpected and we log the trace to help with troubleshooting
LOGGER.exception(exception) LOGGER.exception(exception)
raise UpdateFailed(exception) from exception raise UpdateFailed(exception) from exception
else:
self._last_response = response self._last_response = response
return response.data["data"]["repository"] return response.data["data"]["repository"]
async def _handle_event(self, event: GitHubEventModel) -> None: async def _handle_event(self, event: GitHubEventModel) -> None:
"""Handle an event.""" """Handle an event."""

View file

@ -191,8 +191,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
raise ConfigEntryAuthFailed from err raise ConfigEntryAuthFailed from err
except ApiException as err: except ApiException as err:
raise ConfigEntryNotReady from err raise ConfigEntryNotReady from err
else:
hass.config_entries.async_update_entry(entry, unique_id=primary_calendar.id) hass.config_entries.async_update_entry(entry, unique_id=primary_calendar.id)
# Only expose the add event service if we have the correct permissions # Only expose the add event service if we have the correct permissions
if get_feature_access(hass, entry) is FeatureAccess.read_write: if get_feature_access(hass, entry) is FeatureAccess.read_write:

View file

@ -43,9 +43,8 @@ class LookinFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
LOGGER.exception("Unexpected exception") LOGGER.exception("Unexpected exception")
return self.async_abort(reason="unknown") return self.async_abort(reason="unknown")
else:
self._name = device.name
self._name = device.name
self._host = host self._host = host
self._set_confirm_only() self._set_confirm_only()
self.context["title_placeholders"] = {"name": self._name, "host": host} self.context["title_placeholders"] = {"name": self._name, "host": host}

View file

@ -69,8 +69,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
raise ConfigEntryNotReady( raise ConfigEntryNotReady(
"Unknown error connecting to the Matter server" "Unknown error connecting to the Matter server"
) from err ) from err
else:
async_delete_issue(hass, DOMAIN, "invalid_server_version") async_delete_issue(hass, DOMAIN, "invalid_server_version")
async def on_hass_stop(event: Event) -> None: async def on_hass_stop(event: Event) -> None:
"""Handle incoming stop event from Home Assistant.""" """Handle incoming stop event from Home Assistant."""

View file

@ -36,9 +36,9 @@ def _can_use_icmp_lib_with_privilege() -> None | bool:
" socket" " socket"
) )
return None return None
else:
_LOGGER.debug("Using icmplib in privileged=False mode") _LOGGER.debug("Using icmplib in privileged=False mode")
return False return False
else:
_LOGGER.debug("Using icmplib in privileged=True mode") _LOGGER.debug("Using icmplib in privileged=True mode")
return True return True

View file

@ -153,11 +153,11 @@ class ProtectMediaPlayer(ProtectDeviceEntity, MediaPlayerEntity):
await self.device.play_audio(media_id, blocking=False) await self.device.play_audio(media_id, blocking=False)
except StreamError as err: except StreamError as err:
raise HomeAssistantError(err) from err raise HomeAssistantError(err) from err
else:
# update state after starting player # update state after starting player
self._async_updated_event(self.device) self._async_updated_event(self.device)
# wait until player finishes to update state again # wait until player finishes to update state again
await self.device.wait_until_audio_completes() await self.device.wait_until_audio_completes()
self._async_updated_event(self.device) self._async_updated_event(self.device)

View file

@ -84,9 +84,9 @@ class UptimeRobotDataUpdateCoordinator(DataUpdateCoordinator[list[UptimeRobotMon
raise ConfigEntryAuthFailed(exception) from exception raise ConfigEntryAuthFailed(exception) from exception
except UptimeRobotException as exception: except UptimeRobotException as exception:
raise UpdateFailed(exception) from exception raise UpdateFailed(exception) from exception
else:
if response.status != API_ATTR_OK: if response.status != API_ATTR_OK:
raise UpdateFailed(response.error.message) raise UpdateFailed(response.error.message)
monitors: list[UptimeRobotMonitor] = response.data monitors: list[UptimeRobotMonitor] = response.data

View file

@ -180,10 +180,8 @@ class VLCTelnetConfigFlow(ConfigFlow, domain=DOMAIN):
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
_LOGGER.exception("Unexpected exception") _LOGGER.exception("Unexpected exception")
return self.async_abort(reason="unknown") return self.async_abort(reason="unknown")
else:
return self.async_create_entry( return self.async_create_entry(title=info["title"], data=self.hassio_discovery)
title=info["title"], data=self.hassio_discovery
)
class CannotConnect(exceptions.HomeAssistantError): class CannotConnect(exceptions.HomeAssistantError):