Ensure we have valid config AFTER merging packages #13015#13038
Merged
balloob merged 2 commits intohome-assistant:devfrom Mar 10, 2018
Merged
Ensure we have valid config AFTER merging packages #13015#13038balloob merged 2 commits intohome-assistant:devfrom
balloob merged 2 commits intohome-assistant:devfrom
Conversation
OttoWinter
reviewed
Mar 10, 2018
|
|
||
| # Ensure we have no None values after merge | ||
| for key, value in config.items(): | ||
| if not value: |
Member
There was a problem hiding this comment.
Also, beware of writing
if xwhen you really meanif x is not None-- e.g. when testing whether a variable or argument that defaults to None was set to some other value. The other value might have a type (such as a container) that could be false in a boolean context!
for key, value in config.items():
if value is None:
config[key] = {}
Member
Author
There was a problem hiding this comment.
I think my version might be equal to: config[key] = value or {}, which is the correct behaviour
Member
Author
There was a problem hiding this comment.
Or let correct by saying current behaviour
Member
There was a problem hiding this comment.
Ok, but then the comment should rather be:
# Ensure we have no None, empty or false values after merge
for key, value in config.items():
if not value:
config[key] = {}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description:
My initial diagnosis for #13015 did not include empty components inside packages
This fixes it for #13015 and
check_configwhich will currently suffer from the same fateExample entry for
configuration.yaml(if applicable):Checklist:
tox. Your PR cannot be merged unless tests passIf the code does not interact with devices: