From aec0694823f514e34a1275ebb67f40ced7985848 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Tue, 11 Jul 2023 08:09:57 +0200 Subject: [PATCH] Move tractive attribute to entity class (#96247) Clean up tractive entities --- homeassistant/components/tractive/binary_sensor.py | 2 -- homeassistant/components/tractive/device_tracker.py | 1 - homeassistant/components/tractive/entity.py | 2 ++ homeassistant/components/tractive/sensor.py | 2 -- homeassistant/components/tractive/switch.py | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/tractive/binary_sensor.py b/homeassistant/components/tractive/binary_sensor.py index 4b376941344..cb4abc9b385 100644 --- a/homeassistant/components/tractive/binary_sensor.py +++ b/homeassistant/components/tractive/binary_sensor.py @@ -30,8 +30,6 @@ TRACKERS_WITH_BUILTIN_BATTERY = ("TRNJA4", "TRAXL1") class TractiveBinarySensor(TractiveEntity, BinarySensorEntity): """Tractive sensor.""" - _attr_has_entity_name = True - def __init__( self, user_id: str, item: Trackables, description: BinarySensorEntityDescription ) -> None: diff --git a/homeassistant/components/tractive/device_tracker.py b/homeassistant/components/tractive/device_tracker.py index 038461494d6..e9739819734 100644 --- a/homeassistant/components/tractive/device_tracker.py +++ b/homeassistant/components/tractive/device_tracker.py @@ -36,7 +36,6 @@ async def async_setup_entry( class TractiveDeviceTracker(TractiveEntity, TrackerEntity): """Tractive device tracker.""" - _attr_has_entity_name = True _attr_icon = "mdi:paw" _attr_translation_key = "tracker" diff --git a/homeassistant/components/tractive/entity.py b/homeassistant/components/tractive/entity.py index def321d928f..712f8eda75a 100644 --- a/homeassistant/components/tractive/entity.py +++ b/homeassistant/components/tractive/entity.py @@ -11,6 +11,8 @@ from .const import DOMAIN class TractiveEntity(Entity): """Tractive entity class.""" + _attr_has_entity_name = True + def __init__( self, user_id: str, trackable: dict[str, Any], tracker_details: dict[str, Any] ) -> None: diff --git a/homeassistant/components/tractive/sensor.py b/homeassistant/components/tractive/sensor.py index 9c0f8f307ed..24439b489c8 100644 --- a/homeassistant/components/tractive/sensor.py +++ b/homeassistant/components/tractive/sensor.py @@ -52,8 +52,6 @@ class TractiveSensorEntityDescription( class TractiveSensor(TractiveEntity, SensorEntity): """Tractive sensor.""" - _attr_has_entity_name = True - def __init__( self, user_id: str, diff --git a/homeassistant/components/tractive/switch.py b/homeassistant/components/tractive/switch.py index 7ae480d4f98..6d8274df253 100644 --- a/homeassistant/components/tractive/switch.py +++ b/homeassistant/components/tractive/switch.py @@ -88,7 +88,6 @@ async def async_setup_entry( class TractiveSwitch(TractiveEntity, SwitchEntity): """Tractive switch.""" - _attr_has_entity_name = True entity_description: TractiveSwitchEntityDescription def __init__(