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

Use new unit enums in helpers (#83387)

Browse source
This commit is contained in:
epenet 2022-12-06 22:20:17 +01:00 • committed by GitHub
parent 511fd293b6
commit 9f7fd8956f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/helpers/config_validation.py
View file

@ -82,9 +82,8 @@ from homeassistant.const import (
ENTITY_MATCH_NONE, ENTITY_MATCH_NONE,
SUN_EVENT_SUNRISE, SUN_EVENT_SUNRISE,
SUN_EVENT_SUNSET, SUN_EVENT_SUNSET,
TEMP_CELSIUS,
TEMP_FAHRENHEIT,
WEEKDAYS, WEEKDAYS,
UnitOfTemperature,
) )
from homeassistant.core import split_entity_id, valid_entity_id from homeassistant.core import split_entity_id, valid_entity_id
from homeassistant.exceptions import TemplateError from homeassistant.exceptions import TemplateError
@ -579,13 +578,13 @@ def string_with_no_html(value: Any) -> str:
return str(value) return str(value)
def temperature_unit(value: Any) -> str: def temperature_unit(value: Any) -> UnitOfTemperature:
"""Validate and transform temperature unit.""" """Validate and transform temperature unit."""
value = str(value).upper() value = str(value).upper()
if value == "C": if value == "C":
return TEMP_CELSIUS return UnitOfTemperature.CELSIUS
if value == "F": if value == "F":
return TEMP_FAHRENHEIT return UnitOfTemperature.FAHRENHEIT
raise vol.Invalid("invalid temperature unit (expected C or F)") raise vol.Invalid("invalid temperature unit (expected C or F)")

4
homeassistant/helpers/template.py
View file

@ -38,8 +38,8 @@ from homeassistant.const import (
ATTR_LONGITUDE, ATTR_LONGITUDE,
ATTR_PERSONS, ATTR_PERSONS,
ATTR_UNIT_OF_MEASUREMENT, ATTR_UNIT_OF_MEASUREMENT,
LENGTH_METERS,
STATE_UNKNOWN, STATE_UNKNOWN,
UnitOfLength,
) )
from homeassistant.core import ( from homeassistant.core import (
Context, Context,
@ -1364,7 +1364,7 @@ def distance(hass, *args):
return hass.config.distance(*locations[0]) return hass.config.distance(*locations[0])
return hass.config.units.length( return hass.config.units.length(
loc_util.distance(*locations[0] + locations[1]), LENGTH_METERS loc_util.distance(*locations[0] + locations[1]), UnitOfLength.METERS
) )