From 629104654340eaf979596d868e8ed723371c4148 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Wed, 11 Nov 2020 16:38:33 -0700 Subject: [PATCH 1/2] Streamline SimpliSafe errors --- homeassistant/components/simplisafe/__init__.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py index e06e0b113ab438..c77b1ca715ecec 100644 --- a/homeassistant/components/simplisafe/__init__.py +++ b/homeassistant/components/simplisafe/__init__.py @@ -534,8 +534,7 @@ async def async_update_system(system): ) ) - LOGGER.error("Update failed with stored refresh token") - raise UpdateFailed from result + raise UpdateFailed("Update failed with stored refresh token") LOGGER.warning("SimpliSafe cloud error; trying stored refresh token") self._emergency_refresh_token_used = True @@ -546,23 +545,16 @@ async def async_update_system(system): ) return except SimplipyError as err: - LOGGER.error("Error while using stored refresh token: %s", err) - raise UpdateFailed from err + raise UpdateFailed(f"Error while using stored refresh token: {err}") if isinstance(result, EndpointUnavailable): - # In case the user attempt an action not allowed in their current plan, + # In case the user attempts an action not allowed in their current plan, # we merely log that message at INFO level (so the user is aware, # but not spammed with ERROR messages that they cannot change): LOGGER.info(result) - raise UpdateFailed from result if isinstance(result, SimplipyError): - LOGGER.error("SimpliSafe error while updating: %s", result) - raise UpdateFailed from result - - if isinstance(result, Exception): - LOGGER.error("Unknown error while updating: %s", result) - raise UpdateFailed from result + raise UpdateFailed(f"SimpliSafe error while updating: {result}") if self._api.refresh_token != self.config_entry.data[CONF_TOKEN]: _async_save_refresh_token( From 65817e94a59e64d2b89330fad0196a93a9afcdeb Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Wed, 11 Nov 2020 17:01:52 -0700 Subject: [PATCH 2/2] Linting --- homeassistant/components/simplisafe/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py index c77b1ca715ecec..2430aad43cfaed 100644 --- a/homeassistant/components/simplisafe/__init__.py +++ b/homeassistant/components/simplisafe/__init__.py @@ -545,7 +545,9 @@ async def async_update_system(system): ) return except SimplipyError as err: - raise UpdateFailed(f"Error while using stored refresh token: {err}") + raise UpdateFailed( # pylint: disable=raise-missing-from + f"Error while using stored refresh token: {err}" + ) if isinstance(result, EndpointUnavailable): # In case the user attempts an action not allowed in their current plan,