Enums from HA

custom_components/jablotron100/binary_sensor.py

@@ -1,23 +1,14 @@
 from __future__ import annotations
 from homeassistant import config_entries, core
 from homeassistant.components.binary_sensor import (
+ BinarySensorDeviceClass,
  BinarySensorEntity,
- DEVICE_CLASS_CONNECTIVITY,
- DEVICE_CLASS_DOOR,
- DEVICE_CLASS_GARAGE_DOOR,
- DEVICE_CLASS_GAS,
- DEVICE_CLASS_LOCK,
- DEVICE_CLASS_MOISTURE,
- DEVICE_CLASS_MOTION,
- DEVICE_CLASS_PROBLEM,
- DEVICE_CLASS_SMOKE,
- DEVICE_CLASS_TAMPER,
- DEVICE_CLASS_WINDOW,
 )
+from homeassistant.helpers.entity import EntityCategory
 from homeassistant.const import (
- ENTITY_CATEGORY_DIAGNOSTIC,
  STATE_ON,
 )
+
 from typing import Final
 from .const import (
  DATA_JABLOTRON,
@@ -40,15 +31,15 @@
 from .jablotron import Jablotron, JablotronDevice, JablotronEntity
 
 DEVICE_CLASSES: Final = {
- DEVICE_MOTION_DETECTOR: DEVICE_CLASS_MOTION,
- DEVICE_WINDOW_OPENING_DETECTOR: DEVICE_CLASS_WINDOW,
- DEVICE_DOOR_OPENING_DETECTOR: DEVICE_CLASS_DOOR,
- DEVICE_GARAGE_DOOR_OPENING_DETECTOR: DEVICE_CLASS_GARAGE_DOOR,
- DEVICE_FLOOD_DETECTOR: DEVICE_CLASS_MOISTURE,
- DEVICE_GAS_DETECTOR: DEVICE_CLASS_GAS,
- DEVICE_SMOKE_DETECTOR: DEVICE_CLASS_SMOKE,
- DEVICE_LOCK: DEVICE_CLASS_LOCK,
- DEVICE_TAMPER: DEVICE_CLASS_TAMPER,
+ DEVICE_MOTION_DETECTOR: BinarySensorDeviceClass.MOTION,
+ DEVICE_WINDOW_OPENING_DETECTOR: BinarySensorDeviceClass.WINDOW,
+ DEVICE_DOOR_OPENING_DETECTOR: BinarySensorDeviceClass.DOOR,
+ DEVICE_GARAGE_DOOR_OPENING_DETECTOR: BinarySensorDeviceClass.GARAGE_DOOR,
+ DEVICE_FLOOD_DETECTOR: BinarySensorDeviceClass.MOISTURE,
+ DEVICE_GAS_DETECTOR: BinarySensorDeviceClass.GAS,
+ DEVICE_SMOKE_DETECTOR: BinarySensorDeviceClass.SMOKE,
+ DEVICE_LOCK: BinarySensorDeviceClass.LOCK,
+ DEVICE_TAMPER: BinarySensorDeviceClass.TAMPER,
 }
 
 
@@ -79,8 +70,8 @@ def _update_attributes(self) -> None:
 
 class JablotronProblemSensorEntity(JablotronBinarySensor):
 
- _attr_device_class = DEVICE_CLASS_PROBLEM
- _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+ _attr_device_class = BinarySensorDeviceClass.PROBLEM
+ _attr_entity_category = EntityCategory.DIAGNOSTIC
 
 
 class JablotronDeviceSensorEntity(JablotronBinarySensor):
@@ -112,14 +103,14 @@ def _update_attributes(self) -> None:
 
 class JablotronLanConnectionEntity(JablotronBinarySensor):
 
- _attr_device_class = DEVICE_CLASS_CONNECTIVITY
- _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+ _attr_device_class = BinarySensorDeviceClass.CONNECTIVITY
+ _attr_entity_category = EntityCategory.DIAGNOSTIC
 
 
 class JablotronGsmSignalEntity(JablotronBinarySensor):
 
- _attr_device_class = DEVICE_CLASS_CONNECTIVITY
- _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+ _attr_device_class = BinarySensorDeviceClass.CONNECTIVITY
+ _attr_entity_category = EntityCategory.DIAGNOSTIC
 
  def _update_attributes(self) -> None:
  super()._update_attributes()

custom_components/jablotron100/sensor.py

@@ -1,14 +1,13 @@
 from homeassistant import config_entries, core
 from homeassistant.components.sensor import (
- DEVICE_CLASS_BATTERY,
- DEVICE_CLASS_SIGNAL_STRENGTH,
+ SensorDeviceClass,
  SensorEntity,
- STATE_CLASS_MEASUREMENT,
+ SensorStateClass,
 )
 from homeassistant.const import (
- ENTITY_CATEGORY_DIAGNOSTIC,
  PERCENTAGE,
 )
+from homeassistant.helpers.entity import EntityCategory
 from .const import (
  DATA_JABLOTRON,
  DOMAIN,
@@ -30,7 +29,7 @@ async def async_setup_entry(hass: core.HomeAssistant, config_entry: config_entri
 class JablotronSensor(JablotronEntity, SensorEntity):
 
  _attr_native_unit_of_measurement = PERCENTAGE
- _attr_state_class = STATE_CLASS_MEASUREMENT
+ _attr_state_class = SensorStateClass.MEASUREMENT
 
  def _update_attributes(self) -> None:
  super()._update_attributes()
@@ -40,11 +39,11 @@ def _update_attributes(self) -> None:
 
 class JablotronSignalStrengthEntity(JablotronSensor):
 
- _attr_device_class = DEVICE_CLASS_SIGNAL_STRENGTH
- _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+ _attr_device_class = SensorDeviceClass.SIGNAL_STRENGTH
+ _attr_entity_category = EntityCategory.DIAGNOSTIC
 
 
 class JablotronBatteryLevelEntity(JablotronSensor):
 
- _attr_device_class = DEVICE_CLASS_BATTERY
- _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
+ _attr_device_class = SensorDeviceClass.BATTERY
+ _attr_entity_category = EntityCategory.DIAGNOSTIC

custom_components/jablotron100/switch.py

@@ -1,5 +1,8 @@
 from homeassistant import config_entries, core
-from homeassistant.components.switch import DEVICE_CLASS_SWITCH, SwitchEntity
+from homeassistant.components.switch import (
+ SwitchDeviceClass,
+ SwitchEntity,
+)
 from homeassistant.const import STATE_ON, STATE_OFF
 from .const import (
  DATA_JABLOTRON,
@@ -17,7 +20,7 @@ async def async_setup_entry(hass: core.HomeAssistant, config_entry: config_entri
 class JablotronProgrammableOutputEntity(JablotronEntity, SwitchEntity):
 
  _control: JablotronProgrammableOutput
- _attr_device_class = DEVICE_CLASS_SWITCH
+ _attr_device_class = SwitchDeviceClass.SWITCH
 
  def __init__(
  self,