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
@@ -70,7 +70,7 @@ def object_to_yaml(data: JSON_TYPE) -> str:
|
||||
return result
|
||||
except YAMLError as exc:
|
||||
_LOGGER.error("YAML error: %s", exc)
|
||||
raise HomeAssistantError(exc)
|
||||
raise HomeAssistantError(exc) from exc
|
||||
|
||||
|
||||
def yaml_to_object(data: str) -> JSON_TYPE:
|
||||
@@ -81,7 +81,7 @@ def yaml_to_object(data: str) -> JSON_TYPE:
|
||||
return result
|
||||
except YAMLError as exc:
|
||||
_LOGGER.error("YAML error: %s", exc)
|
||||
raise HomeAssistantError(exc)
|
||||
raise HomeAssistantError(exc) from exc
|
||||
|
||||
|
||||
def load_yaml(fname: str, round_trip: bool = False) -> JSON_TYPE:
|
||||
@@ -102,10 +102,10 @@ def load_yaml(fname: str, round_trip: bool = False) -> JSON_TYPE:
|
||||
return yaml.load(conf_file) or OrderedDict()
|
||||
except YAMLError as exc:
|
||||
_LOGGER.error("YAML error in %s: %s", fname, exc)
|
||||
raise HomeAssistantError(exc)
|
||||
raise HomeAssistantError(exc) from exc
|
||||
except UnicodeDecodeError as exc:
|
||||
_LOGGER.error("Unable to read file %s: %s", fname, exc)
|
||||
raise HomeAssistantError(exc)
|
||||
raise HomeAssistantError(exc) from exc
|
||||
|
||||
|
||||
def save_yaml(fname: str, data: JSON_TYPE) -> None:
|
||||
@@ -132,10 +132,10 @@ def save_yaml(fname: str, data: JSON_TYPE) -> None:
|
||||
pass
|
||||
except YAMLError as exc:
|
||||
_LOGGER.error(str(exc))
|
||||
raise HomeAssistantError(exc)
|
||||
raise HomeAssistantError(exc) from exc
|
||||
except OSError as exc:
|
||||
_LOGGER.exception("Saving YAML file %s failed: %s", fname, exc)
|
||||
raise WriteError(exc)
|
||||
raise WriteError(exc) from exc
|
||||
finally:
|
||||
if os.path.exists(tmp_fname):
|
||||
try:
|
||||
|
||||
Reference in new issue
Block a user