diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py index 2dc25cb751a..e342347cbf9 100644 --- a/homeassistant/components/modbus/binary_sensor.py +++ b/homeassistant/components/modbus/binary_sensor.py @@ -29,7 +29,7 @@ from .const import ( CONF_SLAVE_COUNT, CONF_VIRTUAL_COUNT, ) -from .entity import BasePlatform +from .entity import ModbusBaseEntity from .modbus import ModbusHub PARALLEL_UPDATES = 1 @@ -59,7 +59,7 @@ async def async_setup_platform( async_add_entities(sensors) -class ModbusBinarySensor(BasePlatform, RestoreEntity, BinarySensorEntity): +class ModbusBinarySensor(ModbusBaseEntity, RestoreEntity, BinarySensorEntity): """Modbus binary sensor.""" def __init__( diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index e02162f3906..f886a308f09 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -101,7 +101,7 @@ from .const import ( CONF_WRITE_REGISTERS, DataType, ) -from .entity import BaseStructPlatform +from .entity import ModbusStructEntity from .modbus import ModbusHub PARALLEL_UPDATES = 1 @@ -131,7 +131,7 @@ async def async_setup_platform( async_add_entities(ModbusThermostat(hass, hub, config) for config in climates) -class ModbusThermostat(BaseStructPlatform, RestoreEntity, ClimateEntity): +class ModbusThermostat(ModbusStructEntity, RestoreEntity, ClimateEntity): """Representation of a Modbus Thermostat.""" _attr_supported_features = ( diff --git a/homeassistant/components/modbus/cover.py b/homeassistant/components/modbus/cover.py index 76c84423580..9d4ebc9ebf0 100644 --- a/homeassistant/components/modbus/cover.py +++ b/homeassistant/components/modbus/cover.py @@ -23,7 +23,7 @@ from .const import ( CONF_STATUS_REGISTER, CONF_STATUS_REGISTER_TYPE, ) -from .entity import BasePlatform +from .entity import ModbusBaseEntity from .modbus import ModbusHub PARALLEL_UPDATES = 1 @@ -42,7 +42,7 @@ async def async_setup_platform( async_add_entities(ModbusCover(hass, hub, config) for config in covers) -class ModbusCover(BasePlatform, CoverEntity, RestoreEntity): +class ModbusCover(ModbusBaseEntity, CoverEntity, RestoreEntity): """Representation of a Modbus cover.""" _attr_supported_features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE diff --git a/homeassistant/components/modbus/entity.py b/homeassistant/components/modbus/entity.py index 2bd81ac2ef8..437d0aaf93f 100644 --- a/homeassistant/components/modbus/entity.py +++ b/homeassistant/components/modbus/entity.py @@ -68,7 +68,7 @@ from .const import ( from .modbus import ModbusHub -class BasePlatform(Entity): +class ModbusBaseEntity(Entity): """Base for readonly platforms.""" _value: str | None = None @@ -154,7 +154,7 @@ class BasePlatform(Entity): ) -class BaseStructPlatform(BasePlatform, RestoreEntity): +class ModbusStructEntity(ModbusBaseEntity, RestoreEntity): """Base class representing a sensor/climate.""" def __init__(self, hass: HomeAssistant, hub: ModbusHub, config: dict) -> None: @@ -261,7 +261,7 @@ class BaseStructPlatform(BasePlatform, RestoreEntity): return self.__process_raw_value(val[0]) -class BaseSwitch(BasePlatform, ToggleEntity, RestoreEntity): +class ModbusToggleEntity(ModbusBaseEntity, ToggleEntity, RestoreEntity): """Base class representing a Modbus switch.""" def __init__(self, hass: HomeAssistant, hub: ModbusHub, config: dict) -> None: diff --git a/homeassistant/components/modbus/fan.py b/homeassistant/components/modbus/fan.py index 8636ef4521a..3602fbc5879 100644 --- a/homeassistant/components/modbus/fan.py +++ b/homeassistant/components/modbus/fan.py @@ -12,7 +12,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from . import get_hub from .const import CONF_FANS -from .entity import BaseSwitch +from .entity import ModbusToggleEntity from .modbus import ModbusHub PARALLEL_UPDATES = 1 @@ -31,7 +31,7 @@ async def async_setup_platform( async_add_entities(ModbusFan(hass, hub, config) for config in fans) -class ModbusFan(BaseSwitch, FanEntity): +class ModbusFan(ModbusToggleEntity, FanEntity): """Class representing a Modbus fan.""" def __init__( diff --git a/homeassistant/components/modbus/light.py b/homeassistant/components/modbus/light.py index b5098cb6c46..6e7d2048279 100644 --- a/homeassistant/components/modbus/light.py +++ b/homeassistant/components/modbus/light.py @@ -30,7 +30,7 @@ from .const import ( LIGHT_MODBUS_SCALE_MAX, LIGHT_MODBUS_SCALE_MIN, ) -from .entity import BaseSwitch +from .entity import ModbusToggleEntity from .modbus import ModbusHub PARALLEL_UPDATES = 1 @@ -49,7 +49,7 @@ async def async_setup_platform( async_add_entities(ModbusLight(hass, hub, config) for config in lights) -class ModbusLight(BaseSwitch, LightEntity): +class ModbusLight(ModbusToggleEntity, LightEntity): """Class representing a Modbus light.""" def __init__( diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py index 9932df92d3c..a61fdfb32bd 100644 --- a/homeassistant/components/modbus/sensor.py +++ b/homeassistant/components/modbus/sensor.py @@ -26,7 +26,7 @@ from homeassistant.helpers.update_coordinator import ( from . import get_hub from .const import _LOGGER, CONF_SLAVE_COUNT, CONF_VIRTUAL_COUNT -from .entity import BaseStructPlatform +from .entity import ModbusStructEntity from .modbus import ModbusHub PARALLEL_UPDATES = 1 @@ -56,7 +56,7 @@ async def async_setup_platform( async_add_entities(sensors) -class ModbusRegisterSensor(BaseStructPlatform, RestoreSensor, SensorEntity): +class ModbusRegisterSensor(ModbusStructEntity, RestoreSensor, SensorEntity): """Modbus register sensor.""" def __init__( diff --git a/homeassistant/components/modbus/switch.py b/homeassistant/components/modbus/switch.py index 44b0575d419..9fc3115901d 100644 --- a/homeassistant/components/modbus/switch.py +++ b/homeassistant/components/modbus/switch.py @@ -11,7 +11,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from . import get_hub -from .entity import BaseSwitch +from .entity import ModbusToggleEntity PARALLEL_UPDATES = 1 @@ -29,7 +29,7 @@ async def async_setup_platform( async_add_entities(ModbusSwitch(hass, hub, config) for config in switches) -class ModbusSwitch(BaseSwitch, SwitchEntity): +class ModbusSwitch(ModbusToggleEntity, SwitchEntity): """Base class representing a Modbus switch.""" async def async_turn_on(self, **kwargs: Any) -> None: diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py index 3816e9878cb..00730bd2251 100644 --- a/tests/components/modbus/test_init.py +++ b/tests/components/modbus/test_init.py @@ -8,7 +8,7 @@ This file is responsible for testing: const.py modbus.py validators.py - baseplatform.py (only BasePlatform) + entity.py (only ModbusBaseEntity) It uses binary_sensors/sensors to do black box testing of the read calls. """