Skip to content

Fix the line reference in config error message #20743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 4 commits into from
Feb 4, 2019
Merged

Fix the line reference in config error message #20743

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b531876
Fix the line reference in config error message
awarecan Feb 4, 2019
3a80b84
Fix platform config validation
awarecan Feb 4, 2019
2982786
Fix test
awarecan Feb 4, 2019
12a6e17
Handle error in error handling routine
awarecan Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions homeassistant/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,11 @@ def _format_config_error(ex: vol.Invalid, domain: str, config: Dict) -> str:
else:
message += '{}.'.format(humanize_error(config, ex))

domain_config = config.get(domain, config)
try:
domain_config = config.get(domain, config)
except AttributeError:
domain_config = config

message += " (See {}, line {}). ".format(
getattr(domain_config, '__config_file__', '?'),
getattr(domain_config, '__line__', '?'))
Expand Down Expand Up @@ -759,7 +763,7 @@ def async_process_component_config(
p_validated = component.PLATFORM_SCHEMA( # type: ignore
p_config)
except vol.Invalid as ex:
async_log_exception(ex, domain, config, hass)
async_log_exception(ex, domain, p_config, hass)
continue

# Not all platform components follow same pattern for platforms
Expand All @@ -779,10 +783,10 @@ def async_process_component_config(
# pylint: disable=no-member
try:
p_validated = platform.PLATFORM_SCHEMA( # type: ignore
p_validated)
p_config)
except vol.Invalid as ex:
async_log_exception(ex, '{}.{}'.format(domain, p_name),
p_validated, hass)
p_config, hass)
continue

platforms.append(p_validated)
Expand Down