jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 07:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of SensorEntity (#54624)

Browse Source
This commit is contained in:
Erik Montnemery 2021-08-19 12:53:47 +02:00 committed by GitHub
parent 32a2c5d5db
commit 4903c1fbfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,7 @@ class SensorEntity(Entity):
_attr_native_unit_of_measurement: str | None _attr_native_unit_of_measurement: str | None
_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
_last_reset_reported = False _last_reset_reported = False
_temperature_conversion_reported = False _temperature_conversion_reported = False
@ -176,8 +177,7 @@ class SensorEntity(Entity):
"""Return state attributes.""" """Return state attributes."""
if last_reset := self.last_reset: if last_reset := self.last_reset:
if ( if (
last_reset is not None self.state_class == STATE_CLASS_MEASUREMENT
and self.state_class == STATE_CLASS_MEASUREMENT
and not self._last_reset_reported and not self._last_reset_reported
): ):
self._last_reset_reported = True self._last_reset_reported = True
@ -211,6 +211,7 @@ class SensorEntity(Entity):
return self.entity_description.native_unit_of_measurement return self.entity_description.native_unit_of_measurement
return None return None
@final
@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."""
@ -232,13 +233,10 @@ class SensorEntity(Entity):
return native_unit_of_measurement return native_unit_of_measurement
@final
@property @property
def state(self) -> Any: def state(self) -> Any:
"""Return the state of the sensor and perform unit conversions, if needed.""" """Return the state of the sensor and perform unit conversions, if needed."""
# Test if _attr_state has been set in this instance
if "_attr_state" in self.__dict__:
return self._attr_state
unit_of_measurement = self.native_unit_of_measurement unit_of_measurement = self.native_unit_of_measurement
value = self.native_value value = self.native_value