From cb5d4ee6fa4f56ecd877938137d1aa75b209edab Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Mon, 4 Sep 2023 19:00:19 +0200 Subject: [PATCH] Use shorthand attributes in Octoprint (#99623) --- homeassistant/components/octoprint/binary_sensor.py | 6 +----- homeassistant/components/octoprint/button.py | 7 +------ homeassistant/components/octoprint/sensor.py | 6 +----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/homeassistant/components/octoprint/binary_sensor.py b/homeassistant/components/octoprint/binary_sensor.py index b0e43bd74e0..0bc13f66415 100644 --- a/homeassistant/components/octoprint/binary_sensor.py +++ b/homeassistant/components/octoprint/binary_sensor.py @@ -52,11 +52,7 @@ class OctoPrintBinarySensorBase( self._device_id = device_id self._attr_name = f"OctoPrint {sensor_type}" self._attr_unique_id = f"{sensor_type}-{device_id}" - - @property - def device_info(self): - """Device info.""" - return self.coordinator.device_info + self._attr_device_info = coordinator.device_info @property def is_on(self): diff --git a/homeassistant/components/octoprint/button.py b/homeassistant/components/octoprint/button.py index 578554da5bd..b2c1672b3e4 100644 --- a/homeassistant/components/octoprint/button.py +++ b/homeassistant/components/octoprint/button.py @@ -5,7 +5,6 @@ from homeassistant.components.button import ButtonEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.exceptions import HomeAssistantError -from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity @@ -53,11 +52,7 @@ class OctoprintButton(CoordinatorEntity[OctoprintDataUpdateCoordinator], ButtonE self._device_id = device_id self._attr_name = f"OctoPrint {button_type}" self._attr_unique_id = f"{button_type}-{device_id}" - - @property - def device_info(self) -> DeviceInfo: - """Device info.""" - return self.coordinator.device_info + self._attr_device_info = coordinator.device_info @property def available(self) -> bool: diff --git a/homeassistant/components/octoprint/sensor.py b/homeassistant/components/octoprint/sensor.py index 17bea7b8ac5..1ea29c2b4e8 100644 --- a/homeassistant/components/octoprint/sensor.py +++ b/homeassistant/components/octoprint/sensor.py @@ -104,11 +104,7 @@ class OctoPrintSensorBase( self._device_id = device_id self._attr_name = f"OctoPrint {sensor_type}" self._attr_unique_id = f"{sensor_type}-{device_id}" - - @property - def device_info(self): - """Device info.""" - return self.coordinator.device_info + self._attr_device_info = coordinator.device_info class OctoPrintStatusSensor(OctoPrintSensorBase):