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

Fix KeyError in derivative and integration (#102294)

Browse source
This commit is contained in:
Robert Resch 2023-10-19 18:22:22 +02:00 • committed by GitHub
parent 3a4341dbeb
commit eab4c24f7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/derivative/sensor.py
View file

@ -116,6 +116,10 @@ async def async_setup_entry(
else: else:
device_info = None device_info = None
if (unit_prefix := config_entry.options.get(CONF_UNIT_PREFIX)) == "none":
# Before we had support for optional selectors, "none" was used for selecting nothing
unit_prefix = None
derivative_sensor = DerivativeSensor( derivative_sensor = DerivativeSensor(
name=config_entry.title, name=config_entry.title,
round_digits=int(config_entry.options[CONF_ROUND_DIGITS]), round_digits=int(config_entry.options[CONF_ROUND_DIGITS]),
@ -123,7 +127,7 @@ async def async_setup_entry(
time_window=cv.time_period_dict(config_entry.options[CONF_TIME_WINDOW]), time_window=cv.time_period_dict(config_entry.options[CONF_TIME_WINDOW]),
unique_id=config_entry.entry_id, unique_id=config_entry.entry_id,
unit_of_measurement=None, unit_of_measurement=None,
unit_prefix=config_entry.options.get(CONF_UNIT_PREFIX), unit_prefix=unit_prefix,
unit_time=config_entry.options[CONF_UNIT_TIME], unit_time=config_entry.options[CONF_UNIT_TIME],
device_info=device_info, device_info=device_info,
) )

6
homeassistant/components/integration/sensor.py
View file

@ -169,13 +169,17 @@ async def async_setup_entry(
else: else:
device_info = None device_info = None
if (unit_prefix := config_entry.options.get(CONF_UNIT_PREFIX)) == "none":
# Before we had support for optional selectors, "none" was used for selecting nothing
unit_prefix = None
integral = IntegrationSensor( integral = IntegrationSensor(
integration_method=config_entry.options[CONF_METHOD], integration_method=config_entry.options[CONF_METHOD],
name=config_entry.title, name=config_entry.title,
round_digits=int(config_entry.options[CONF_ROUND_DIGITS]), round_digits=int(config_entry.options[CONF_ROUND_DIGITS]),
source_entity=source_entity_id, source_entity=source_entity_id,
unique_id=config_entry.entry_id, unique_id=config_entry.entry_id,
unit_prefix=config_entry.options.get(CONF_UNIT_PREFIX), unit_prefix=unit_prefix,
unit_time=config_entry.options[CONF_UNIT_TIME], unit_time=config_entry.options[CONF_UNIT_TIME],
device_info=device_info, device_info=device_info,
) )

3
homeassistant/components/template/config_flow.py
View file

@ -176,8 +176,7 @@ def validate_user_input(
]: ]:
"""Do post validation of user input. """Do post validation of user input.
For binary sensors: Strip none-sentinels. For sensors: Validate unit of measurement.
For sensors: Strip none-sentinels and validate unit of measurement.
For all domaines: Set template type. For all domaines: Set template type.
""" """