From 079b7f217ffddb1e78b93726dc75d2a0a3bb788d Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Thu, 16 Dec 2021 15:09:31 +0100 Subject: [PATCH] Use new enums in mqtt (#61936) * Use new enums in mqtt * Fix typo --- homeassistant/components/mqtt/humidifier.py | 9 +++++---- homeassistant/components/mqtt/sensor.py | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/mqtt/humidifier.py b/homeassistant/components/mqtt/humidifier.py index fcafa185509..1a0a9988762 100644 --- a/homeassistant/components/mqtt/humidifier.py +++ b/homeassistant/components/mqtt/humidifier.py @@ -10,9 +10,8 @@ from homeassistant.components.humidifier import ( ATTR_MODE, DEFAULT_MAX_HUMIDITY, DEFAULT_MIN_HUMIDITY, - DEVICE_CLASS_DEHUMIDIFIER, - DEVICE_CLASS_HUMIDIFIER, SUPPORT_MODES, + HumidifierDeviceClass, HumidifierEntity, ) from homeassistant.const import ( @@ -96,8 +95,10 @@ _PLATFORM_SCHEMA_BASE = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend( CONF_MODE_COMMAND_TOPIC, "available_modes" ): mqtt.valid_publish_topic, vol.Optional(CONF_COMMAND_TEMPLATE): cv.template, - vol.Optional(CONF_DEVICE_CLASS, default=DEVICE_CLASS_HUMIDIFIER): vol.In( - [DEVICE_CLASS_HUMIDIFIER, DEVICE_CLASS_DEHUMIDIFIER] + vol.Optional( + CONF_DEVICE_CLASS, default=HumidifierDeviceClass.HUMIDIFIER + ): vol.In( + [HumidifierDeviceClass.HUMIDIFIER, HumidifierDeviceClass.DEHUMIDIFIER] ), vol.Optional(CONF_MODE_COMMAND_TEMPLATE): cv.template, vol.Optional(CONF_MODE_STATE_TOPIC): mqtt.valid_subscribe_topic, diff --git a/homeassistant/components/mqtt/sensor.py b/homeassistant/components/mqtt/sensor.py index 72f0b339fe2..4e0c38a096c 100644 --- a/homeassistant/components/mqtt/sensor.py +++ b/homeassistant/components/mqtt/sensor.py @@ -13,6 +13,7 @@ from homeassistant.components.sensor import ( DEVICE_CLASSES_SCHEMA, ENTITY_ID_FORMAT, STATE_CLASSES_SCHEMA, + SensorDeviceClass, SensorEntity, ) from homeassistant.const import ( @@ -21,8 +22,6 @@ from homeassistant.const import ( CONF_NAME, CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE, - DEVICE_CLASS_DATE, - DEVICE_CLASS_TIMESTAMP, ) from homeassistant.core import HomeAssistant, callback import homeassistant.helpers.config_validation as cv @@ -200,14 +199,14 @@ class MqttSensor(MqttEntity, SensorEntity): ) if payload is not None and self.device_class in ( - DEVICE_CLASS_DATE, - DEVICE_CLASS_TIMESTAMP, + SensorDeviceClass.DATE, + SensorDeviceClass.TIMESTAMP, ): if (payload := dt_util.parse_datetime(payload)) is None: _LOGGER.warning( "Invalid state message '%s' from '%s'", msg.payload, msg.topic ) - elif self.device_class == DEVICE_CLASS_DATE: + elif self.device_class == SensorDeviceClass.DATE: payload = payload.date() self._state = payload