feedc0de/homeassistant-core
1
0
Fork 0
forked from home-assistant/core
Code Pull Requests Activity

Prevent setting _attr_unit_of_measurement in subclasses of SensorEntity (#55211)

Browse Source
This commit is contained in:
Erik Montnemery
2021-08-25 15:44:35 +02:00
committed by GitHub
parent 856f4ad740
commit 7f80781f9b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/sensor/__init__.py
View File

@@ -167,6 +167,9 @@ class SensorEntity(Entity):
_attr_native_value: StateType = None _attr_native_value: StateType = None
_attr_state_class: str | None _attr_state_class: str | None
_attr_state: None = None # Subclasses of SensorEntity should not set this _attr_state: None = None # Subclasses of SensorEntity should not set this
_attr_unit_of_measurement: None = (
None # Subclasses of SensorEntity should not set this
)
_last_reset_reported = False _last_reset_reported = False
_temperature_conversion_reported = False _temperature_conversion_reported = False
@@ -240,11 +243,12 @@ class SensorEntity(Entity):
@property @property
def unit_of_measurement(self) -> str | None: def unit_of_measurement(self) -> str | None:
"""Return the unit of measurement of the entity, after unit conversion.""" """Return the unit of measurement of the entity, after unit conversion."""
# Support for _attr_unit_of_measurement will be removed in Home Assistant 2021.11
if ( if (
hasattr(self, "_attr_unit_of_measurement") hasattr(self, "_attr_unit_of_measurement")
and self._attr_unit_of_measurement is not None and self._attr_unit_of_measurement is not None
): ):
return self._attr_unit_of_measurement return self._attr_unit_of_measurement # type: ignore
native_unit_of_measurement = self.native_unit_of_measurement native_unit_of_measurement = self.native_unit_of_measurement