diff --git a/homeassistant/components/vicare/binary_sensor.py b/homeassistant/components/vicare/binary_sensor.py index 507bc84fed9..7fe248fa266 100644 --- a/homeassistant/components/vicare/binary_sensor.py +++ b/homeassistant/components/vicare/binary_sensor.py @@ -31,13 +31,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import DEVICE_LIST, DOMAIN from .entity import ViCareEntity from .types import ViCareDevice, ViCareRequiredKeysMixin -from .utils import ( - get_burners, - get_circuits, - get_compressors, - get_device_serial, - is_supported, -) +from .utils import get_burners, get_circuits, get_compressors, is_supported _LOGGER = logging.getLogger(__name__) @@ -122,7 +116,6 @@ def _build_entities( entities.extend( ViCareBinarySensor( description, - get_device_serial(device), device.config, device.api, ) @@ -138,7 +131,6 @@ def _build_entities( entities.extend( ViCareBinarySensor( description, - get_device_serial(device), device.config, device.api, component, @@ -174,15 +166,12 @@ class ViCareBinarySensor(ViCareEntity, BinarySensorEntity): def __init__( self, description: ViCareBinarySensorEntityDescription, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, component: PyViCareHeatingDeviceComponent | None = None, ) -> None: """Initialize the sensor.""" - super().__init__( - description.key, device_serial, device_config, device, component - ) + super().__init__(description.key, device_config, device, component) self.entity_description = description @property diff --git a/homeassistant/components/vicare/button.py b/homeassistant/components/vicare/button.py index d45f36d0047..51a763c1fcc 100644 --- a/homeassistant/components/vicare/button.py +++ b/homeassistant/components/vicare/button.py @@ -24,7 +24,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import DEVICE_LIST, DOMAIN from .entity import ViCareEntity from .types import ViCareDevice, ViCareRequiredKeysMixinWithSet -from .utils import get_device_serial, is_supported +from .utils import is_supported _LOGGER = logging.getLogger(__name__) @@ -55,7 +55,6 @@ def _build_entities( return [ ViCareButton( description, - get_device_serial(device), device.config, device.api, ) @@ -89,12 +88,11 @@ class ViCareButton(ViCareEntity, ButtonEntity): def __init__( self, description: ViCareButtonEntityDescription, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, ) -> None: """Initialize the button.""" - super().__init__(description.key, device_serial, device_config, device) + super().__init__(description.key, device_config, device) self.entity_description = description def press(self) -> None: diff --git a/homeassistant/components/vicare/climate.py b/homeassistant/components/vicare/climate.py index fbea9a9afbc..410395760ea 100644 --- a/homeassistant/components/vicare/climate.py +++ b/homeassistant/components/vicare/climate.py @@ -40,7 +40,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import DEVICE_LIST, DOMAIN from .entity import ViCareEntity from .types import HeatingProgram, ViCareDevice -from .utils import get_burners, get_circuits, get_compressors, get_device_serial +from .utils import get_burners, get_circuits, get_compressors _LOGGER = logging.getLogger(__name__) @@ -87,7 +87,6 @@ def _build_entities( """Create ViCare climate entities for a device.""" return [ ViCareClimate( - get_device_serial(device), device.config, device.api, circuit, @@ -144,15 +143,12 @@ class ViCareClimate(ViCareEntity, ClimateEntity): def __init__( self, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, circuit: PyViCareHeatingCircuit, ) -> None: """Initialize the climate device.""" - super().__init__( - self._attr_translation_key, device_serial, device_config, device, circuit - ) + super().__init__(self._attr_translation_key, device_config, device, circuit) self._device = device self._attributes: dict[str, Any] = {} self._attributes["vicare_programs"] = self._api.getPrograms() diff --git a/homeassistant/components/vicare/fan.py b/homeassistant/components/vicare/fan.py index ca586d7bfdb..d7dbd037b56 100644 --- a/homeassistant/components/vicare/fan.py +++ b/homeassistant/components/vicare/fan.py @@ -29,7 +29,6 @@ from homeassistant.util.percentage import ( from .const import DEVICE_LIST, DOMAIN from .entity import ViCareEntity -from .utils import get_device_serial _LOGGER = logging.getLogger(__name__) @@ -101,7 +100,7 @@ async def async_setup_entry( async_add_entities( [ - ViCareFan(get_device_serial(device), device.config, device.api) + ViCareFan(device.config, device.api) for device in device_list if isinstance(device.api, PyViCareVentilationDevice) ] @@ -126,14 +125,11 @@ class ViCareFan(ViCareEntity, FanEntity): def __init__( self, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, ) -> None: """Initialize the fan entity.""" - super().__init__( - self._attr_translation_key, device_serial, device_config, device - ) + super().__init__(self._attr_translation_key, device_config, device) def update(self) -> None: """Update state of fan.""" diff --git a/homeassistant/components/vicare/number.py b/homeassistant/components/vicare/number.py index b80bc6174ce..a7f679f7224 100644 --- a/homeassistant/components/vicare/number.py +++ b/homeassistant/components/vicare/number.py @@ -33,7 +33,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import DEVICE_LIST, DOMAIN from .entity import ViCareEntity from .types import HeatingProgram, ViCareDevice, ViCareRequiredKeysMixin -from .utils import get_circuits, get_device_serial, is_supported +from .utils import get_circuits, is_supported _LOGGER = logging.getLogger(__name__) @@ -279,7 +279,6 @@ def _build_entities( entities.extend( ViCareNumber( description, - get_device_serial(device), device.config, device.api, ) @@ -290,7 +289,6 @@ def _build_entities( entities.extend( ViCareNumber( description, - get_device_serial(device), device.config, device.api, circuit, @@ -326,15 +324,12 @@ class ViCareNumber(ViCareEntity, NumberEntity): def __init__( self, description: ViCareNumberEntityDescription, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, component: PyViCareHeatingDeviceComponent | None = None, ) -> None: """Initialize the number.""" - super().__init__( - description.key, device_serial, device_config, device, component - ) + super().__init__(description.key, device_config, device, component) self.entity_description = description @property diff --git a/homeassistant/components/vicare/sensor.py b/homeassistant/components/vicare/sensor.py index 640a99550b3..bdcb6dfa3aa 100644 --- a/homeassistant/components/vicare/sensor.py +++ b/homeassistant/components/vicare/sensor.py @@ -51,13 +51,7 @@ from .const import ( ) from .entity import ViCareEntity from .types import ViCareDevice, ViCareRequiredKeysMixin -from .utils import ( - get_burners, - get_circuits, - get_compressors, - get_device_serial, - is_supported, -) +from .utils import get_burners, get_circuits, get_compressors, is_supported _LOGGER = logging.getLogger(__name__) @@ -874,7 +868,6 @@ def _build_entities( entities.extend( ViCareSensor( description, - get_device_serial(device), device.config, device.api, ) @@ -890,7 +883,6 @@ def _build_entities( entities.extend( ViCareSensor( description, - get_device_serial(device), device.config, device.api, component, @@ -928,15 +920,12 @@ class ViCareSensor(ViCareEntity, SensorEntity): def __init__( self, description: ViCareSensorEntityDescription, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, component: PyViCareHeatingDeviceComponent | None = None, ) -> None: """Initialize the sensor.""" - super().__init__( - description.key, device_serial, device_config, device, component - ) + super().__init__(description.key, device_config, device, component) self.entity_description = description @property diff --git a/homeassistant/components/vicare/water_heater.py b/homeassistant/components/vicare/water_heater.py index 1c3e7008a52..621d2f2a09b 100644 --- a/homeassistant/components/vicare/water_heater.py +++ b/homeassistant/components/vicare/water_heater.py @@ -28,7 +28,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import DEVICE_LIST, DOMAIN from .entity import ViCareEntity from .types import ViCareDevice -from .utils import get_circuits, get_device_serial +from .utils import get_circuits _LOGGER = logging.getLogger(__name__) @@ -69,7 +69,6 @@ def _build_entities( return [ ViCareWater( - get_device_serial(device), device.config, device.api, circuit, @@ -109,13 +108,12 @@ class ViCareWater(ViCareEntity, WaterHeaterEntity): def __init__( self, - device_serial: str | None, device_config: PyViCareDeviceConfig, device: PyViCareDevice, circuit: PyViCareHeatingCircuit, ) -> None: """Initialize the DHW water_heater device.""" - super().__init__(circuit.id, device_serial, device_config, device) + super().__init__(circuit.id, device_config, device) self._circuit = circuit self._attributes: dict[str, Any] = {}