jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty files included by !include_dir_named (#108489)

Browse Source 
Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
This commit is contained in:
Erik Montnemery 2024-01-20 15:12:32 +01:00 committed by GitHub
parent a3619e544e
commit 1cb5bbf865
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/util/yaml/loader.py
View File

@ -359,7 +359,12 @@ def _include_dir_named_yaml(loader: LoaderType, node: yaml.nodes.Node) -> NodeDi
filename = os.path.splitext(os.path.basename(fname))[0] filename = os.path.splitext(os.path.basename(fname))[0]
if os.path.basename(fname) == SECRET_YAML: if os.path.basename(fname) == SECRET_YAML:
continue continue
mapping[filename] = load_yaml(fname, loader.secrets) loaded_yaml = load_yaml(fname, loader.secrets)
if loaded_yaml is None:
# Special case, an empty file included by !include_dir_named is treated
# as an empty dictionary
loaded_yaml = NodeDictClass()
mapping[filename] = loaded_yaml
return _add_reference(mapping, loader, node) return _add_reference(mapping, loader, node)

2
tests/util/yaml/test_init.py
View File

@ -193,7 +193,7 @@ def test_include_dir_list_recursive(
), ),
( (
{"/test/first.yaml": "1", "/test/second.yaml": None}, {"/test/first.yaml": "1", "/test/second.yaml": None},
{"first": 1, "second": None}, {"first": 1, "second": {}},
), ),
], ],
) )