Move sensor mqtt state update functions to bound methods (#118188)

This commit is contained in:
J. Nick Koston 2024-05-26 10:42:09 -10:00 committed by GitHub
parent 226d010ab2
commit e74292e358
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -210,10 +210,7 @@ class MqttSensor(MqttEntity, RestoreSensor):
).async_render_with_possible_json_value
@callback
def _state_message_received(self, msg: ReceiveMessage) -> None:
"""Handle new MQTT state messages."""
def _update_state(msg: ReceiveMessage) -> None:
def _update_state(self, msg: ReceiveMessage) -> None:
# auto-expire enabled?
if self._expire_after is not None and self._expire_after > 0:
# When self._expire_after is set, and we receive a message, assume
@ -261,7 +258,8 @@ class MqttSensor(MqttEntity, RestoreSensor):
return
self._attr_native_value = payload_datetime
def _update_last_reset(msg: ReceiveMessage) -> None:
@callback
def _update_last_reset(self, msg: ReceiveMessage) -> None:
payload = self._last_reset_template(msg.payload)
if not payload:
@ -277,9 +275,12 @@ class MqttSensor(MqttEntity, RestoreSensor):
"Invalid last_reset message '%s' from '%s'", msg.payload, msg.topic
)
_update_state(msg)
@callback
def _state_message_received(self, msg: ReceiveMessage) -> None:
"""Handle new MQTT state messages."""
self._update_state(msg)
if CONF_LAST_RESET_VALUE_TEMPLATE in self._config:
_update_last_reset(msg)
self._update_last_reset(msg)
@callback
def _prepare_subscribe_topics(self) -> None: