evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove logic converting empty or falsy YAML to empty dict (#103912)

Browse source 
* Correct logic converting empty YAML to empty dict

* Modify according to github comments

* Add load_yaml_dict helper

* Update check_config script

* Update tests
This commit is contained in:
Erik Montnemery 2023-12-05 18:08:11 +01:00 • committed by GitHub
parent a8ca73a7dd
commit 5b55c7da5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 112 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
script/hassfest/services.py
View file

@ -13,7 +13,7 @@ from voluptuous.humanize import humanize_error
from homeassistant.const import CONF_SELECTOR
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import config_validation as cv, selector, service
from homeassistant.util.yaml import load_yaml
from homeassistant.util.yaml import load_yaml_dict
from .model import Config, Integration
@ -107,7 +107,7 @@ def grep_dir(path: pathlib.Path, glob_pattern: str, search_pattern: str) -> bool
def validate_services(config: Config, integration: Integration) -> None:
"""Validate services."""
try:
data = load_yaml(str(integration.path / "services.yaml"))
data = load_yaml_dict(str(integration.path / "services.yaml"))
except FileNotFoundError:
# Find if integration uses services
has_services = grep_dir(
@ -122,7 +122,7 @@ def validate_services(config: Config, integration: Integration) -> None:
)
return
except HomeAssistantError:
integration.add_error("services", "Unable to load services.yaml")
integration.add_error("services", "Invalid services.yaml")
return
try: