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:
1 parent
d768fd4de9
commit
b4bac0f7a0
204 files changed
+550
-518
No files matched your search
@@ -98,8 +98,8 @@ class DeconzGateway:
|
||||
self.async_connection_status_callback,
|
||||
)
|
||||
|
||||
except CannotConnect:
|
||||
raise ConfigEntryNotReady
|
||||
except CannotConnect as err:
|
||||
raise ConfigEntryNotReady from err
|
||||
|
||||
except Exception as err: # pylint: disable=broad-except
|
||||
LOGGER.error("Error connecting with deCONZ gateway: %s", err)
|
||||
@@ -254,10 +254,10 @@ async def get_gateway(
|
||||
await deconz.initialize()
|
||||
return deconz
|
||||
|
||||
except errors.Unauthorized:
|
||||
except errors.Unauthorized as err:
|
||||
LOGGER.warning("Invalid key for deCONZ at %s", config[CONF_HOST])
|
||||
raise AuthenticationRequired
|
||||
raise AuthenticationRequired from err
|
||||
|
||||
except (asyncio.TimeoutError, errors.RequestError):
|
||||
except (asyncio.TimeoutError, errors.RequestError) as err:
|
||||
LOGGER.error("Error connecting to deCONZ gateway at %s", config[CONF_HOST])
|
||||
raise CannotConnect
|
||||
raise CannotConnect from err
|
||||
Reference in new issue
Block a user