From 92628ea068849542af29558951878f2d39cd11f7 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker <joostlek@outlook.com> Date: Fri, 8 Sep 2023 01:16:35 +0200 Subject: [PATCH] Use shorthand attributes in Starline (#99882) --- homeassistant/components/starline/entity.py | 12 ++---------- homeassistant/components/starline/switch.py | 7 ++----- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/homeassistant/components/starline/entity.py b/homeassistant/components/starline/entity.py index 7eee5e7a7f8..27be5e2aace 100644 --- a/homeassistant/components/starline/entity.py +++ b/homeassistant/components/starline/entity.py @@ -21,6 +21,8 @@ class StarlineEntity(Entity): self._account = account self._device = device self._key = key + self._attr_unique_id = f"starline-{key}-{device.device_id}" + self._attr_device_info = account.device_info(device) self._unsubscribe_api: Callable | None = None @property @@ -28,16 +30,6 @@ class StarlineEntity(Entity): """Return True if entity is available.""" return self._account.api.available - @property - def unique_id(self): - """Return the unique ID of the entity.""" - return f"starline-{self._key}-{self._device.device_id}" - - @property - def device_info(self): - """Return the device info.""" - return self._account.device_info(self._device) - def update(self): """Read new state data.""" self.schedule_update_ha_state() diff --git a/homeassistant/components/starline/switch.py b/homeassistant/components/starline/switch.py index b254fa8133f..ebe27e29e8c 100644 --- a/homeassistant/components/starline/switch.py +++ b/homeassistant/components/starline/switch.py @@ -77,6 +77,8 @@ class StarlineSwitch(StarlineEntity, SwitchEntity): entity_description: StarlineSwitchEntityDescription + _attr_assumed_state = True + def __init__( self, account: StarlineAccount, @@ -108,11 +110,6 @@ class StarlineSwitch(StarlineEntity, SwitchEntity): else self.entity_description.icon_off ) - @property - def assumed_state(self): - """Return True if unable to access real state of the entity.""" - return True - @property def is_on(self): """Return True if entity is on.""" -- GitLab