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

Deprecate CONF_UNIT_SYSTEM_*** constants (#80320)

Browse source 
* Deprecate CONF_UNIT_SYSTEM_*** constants

* Adjust pylint plugin

* Add tests

* Remove single-use function

* Revert logic change

* Revert "Revert logic change"

This reverts commit 60959a0050.

* Tweak again
This commit is contained in:
epenet 2022-10-14 16:50:04 +02:00 • committed by GitHub
parent 284893d942
commit bff5d1123f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 72 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
homeassistant/core.py
View file

@ -49,7 +49,6 @@ from .const import (
ATTR_FRIENDLY_NAME,
ATTR_SERVICE,
ATTR_SERVICE_DATA,
CONF_UNIT_SYSTEM_IMPERIAL,
EVENT_CALL_SERVICE,
EVENT_CORE_CONFIG_UPDATE,
EVENT_HOMEASSISTANT_CLOSE,
@ -82,7 +81,7 @@ from .util.async_ import (
)
from .util.read_only_dict import ReadOnlyDict
from .util.timeout import TimeoutManager
from .util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM, UnitSystem
from .util.unit_system import METRIC_SYSTEM, UnitSystem, get_unit_system
# Typing imports that create a circular dependency
if TYPE_CHECKING:
@ -1940,9 +1939,9 @@ class Config:
if elevation is not None:
self.elevation = elevation
if unit_system is not None:
if unit_system == CONF_UNIT_SYSTEM_IMPERIAL:
self.units = IMPERIAL_SYSTEM
else:
try:
self.units = get_unit_system(unit_system)
except ValueError:
self.units = METRIC_SYSTEM
if location_name is not None:
self.location_name = location_name
@ -2015,7 +2014,7 @@ class Config:
"latitude": self.latitude,
"longitude": self.longitude,
"elevation": self.elevation,
# We don't want any components to use the name of the unit system
# We don't want any integrations to use the name of the unit system
# so we are using the private attribute here
"unit_system": self.units._name, # pylint: disable=protected-access
"location_name": self.location_name,