From f69fd14f4b39a1588990417c3ce7269dcab23563 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Thu, 9 Jul 2026 09:31:55 +0200 Subject: [PATCH] Use ZoneEntityStateAttribute enum in device_tracker (#175976) Co-authored-by: Claude Opus 4.8 (1M context) --- homeassistant/components/device_tracker/entity.py | 10 +++++++--- homeassistant/components/device_tracker/legacy.py | 8 +++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/device_tracker/entity.py b/homeassistant/components/device_tracker/entity.py index 7f1b77b37198..0b4b8bde1e0c 100644 --- a/homeassistant/components/device_tracker/entity.py +++ b/homeassistant/components/device_tracker/entity.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Any, final, override from propcache.api import cached_property from homeassistant.components import zone -from homeassistant.components.zone import ATTR_PASSIVE, ATTR_RADIUS +from homeassistant.components.zone import ZoneEntityStateAttribute from homeassistant.const import ( # noqa: F401 ATTR_BATTERY_LEVEL, ATTR_GPS_ACCURACY, @@ -368,10 +368,14 @@ class TrackerEntity( for entity_id in zones if (zone_state := self.hass.states.get(entity_id)) is not None ), - key=lambda z: z.attributes[ATTR_RADIUS], + key=lambda z: z.attributes[ZoneEntityStateAttribute.RADIUS], ) self.__active_zone = next( - (z for z in zone_states if not z.attributes.get(ATTR_PASSIVE)), + ( + z + for z in zone_states + if not z.attributes.get(ZoneEntityStateAttribute.PASSIVE) + ), None, ) self.__in_zones = [z.entity_id for z in zone_states] diff --git a/homeassistant/components/device_tracker/legacy.py b/homeassistant/components/device_tracker/legacy.py index 8abb4a44f3d3..0700db8e18e4 100644 --- a/homeassistant/components/device_tracker/legacy.py +++ b/homeassistant/components/device_tracker/legacy.py @@ -14,7 +14,7 @@ import voluptuous as vol from homeassistant import util from homeassistant.components import zone -from homeassistant.components.zone import ENTITY_ID_HOME +from homeassistant.components.zone import ENTITY_ID_HOME, ZoneEntityStateAttribute from homeassistant.config import ( async_log_schema_error, config_per_platform, @@ -24,8 +24,6 @@ from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_GPS_ACCURACY, ATTR_ICON, - ATTR_LATITUDE, - ATTR_LONGITUDE, ATTR_NAME, CONF_ICON, CONF_MAC, @@ -511,8 +509,8 @@ def async_setup_scanner_platform( zone_home = hass.states.get(ENTITY_ID_HOME) if zone_home is not None: kwargs["gps"] = [ - zone_home.attributes[ATTR_LATITUDE], - zone_home.attributes[ATTR_LONGITUDE], + zone_home.attributes[ZoneEntityStateAttribute.LATITUDE], + zone_home.attributes[ZoneEntityStateAttribute.LONGITUDE], ] kwargs["gps_accuracy"] = 0