Exception chaining and wrapping improvements (#39320)

* Remove unnecessary exception re-wraps

* Preserve exception chains on re-raise

We slap "from cause" to almost all possible cases here. In some cases it
could conceivably be better to do "from None" if we really want to hide
the cause. However those should be in the minority, and "from cause"
should be an improvement over the corresponding raise without a "from"
in all cases anyway.

The only case where we raise from None here is in plex, where the
exception for an original invalid SSL cert is not the root cause for
failure to validate a newly fetched one.

Follow local convention on exception variable names if there is a
consistent one, otherwise `err` to match with majority of codebase.

* Fix mistaken re-wrap in homematicip_cloud/hap.py

Missed the difference between HmipConnectionError and
HmipcConnectionError.

* Do not hide original error on plex new cert validation error

Original is not the cause for the new one, but showing old in the
traceback is useful nevertheless.
This commit is contained in:
Ville Skyttä authored and GitHub committed 2020-08-28 13:50:32 +02:00
1 parent d768fd4de9
commit b4bac0f7a0
204 files changed
+550 -518

No files matched your search

+8 -8
View File
@@ -186,8 +186,8 @@ class AxisNetworkDevice:
password=self.config_entry.data[CONF_PASSWORD],
)
except CannotConnect:
raise ConfigEntryNotReady
except CannotConnect as err:
raise ConfigEntryNotReady from err
except Exception: # pylint: disable=broad-except
LOGGER.error("Unknown error connecting with Axis device on %s", self.host)
@@ -271,14 +271,14 @@ async def get_device(hass, host, port, username, password):
return device
except axis.Unauthorized:
except axis.Unauthorized as err:
LOGGER.warning("Connected to device at %s but not registered.", host)
raise AuthenticationRequired
raise AuthenticationRequired from err
except (asyncio.TimeoutError, axis.RequestError):
except (asyncio.TimeoutError, axis.RequestError) as err:
LOGGER.error("Error connecting to the Axis device at %s", host)
raise CannotConnect
raise CannotConnect from err
except axis.AxisException:
except axis.AxisException as err:
LOGGER.exception("Unknown Axis communication error occurred")
raise AuthenticationRequired
raise AuthenticationRequired from err