mirror of
https://github.com/home-assistant/core.git
synced 2025-12-24 12:59:34 +00:00
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:
@@ -264,7 +264,7 @@ class _ScriptRun:
|
||||
ex,
|
||||
level=logging.ERROR,
|
||||
)
|
||||
raise _StopScript
|
||||
raise _StopScript from ex
|
||||
|
||||
async def _async_delay_step(self):
|
||||
"""Handle delay."""
|
||||
@@ -327,10 +327,10 @@ class _ScriptRun:
|
||||
try:
|
||||
async with timeout(delay) as to_context:
|
||||
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
|
||||
except asyncio.TimeoutError:
|
||||
except asyncio.TimeoutError as ex:
|
||||
if not self._action.get(CONF_CONTINUE_ON_TIMEOUT, True):
|
||||
self._log(_TIMEOUT_MSG)
|
||||
raise _StopScript
|
||||
raise _StopScript from ex
|
||||
self._variables["wait"]["remaining"] = 0.0
|
||||
finally:
|
||||
for task in tasks:
|
||||
@@ -502,7 +502,7 @@ class _ScriptRun:
|
||||
ex,
|
||||
level=logging.ERROR,
|
||||
)
|
||||
raise _StopScript
|
||||
raise _StopScript from ex
|
||||
extra_msg = f" of {count}"
|
||||
for iteration in range(1, count + 1):
|
||||
set_repeat_var(iteration, count)
|
||||
@@ -600,10 +600,10 @@ class _ScriptRun:
|
||||
try:
|
||||
async with timeout(delay) as to_context:
|
||||
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
|
||||
except asyncio.TimeoutError:
|
||||
except asyncio.TimeoutError as ex:
|
||||
if not self._action.get(CONF_CONTINUE_ON_TIMEOUT, True):
|
||||
self._log(_TIMEOUT_MSG)
|
||||
raise _StopScript
|
||||
raise _StopScript from ex
|
||||
self._variables["wait"]["remaining"] = 0.0
|
||||
finally:
|
||||
for task in tasks:
|
||||
|
||||
Reference in New Issue
Block a user