From c9ddb10024179dfcbcb6a2867bb95aa282c1832a Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Sun, 31 Jul 2022 14:01:18 +0200 Subject: [PATCH] Use device_tracker SourceType enum [s-z] (#75966) --- homeassistant/components/starline/device_tracker.py | 6 +++--- homeassistant/components/tile/device_tracker.py | 6 +++--- homeassistant/components/traccar/device_tracker.py | 6 +++--- homeassistant/components/tractive/device_tracker.py | 11 ++++------- homeassistant/components/unifi/device_tracker.py | 10 +++++----- .../components/volvooncall/device_tracker.py | 4 ++-- homeassistant/components/zha/device_tracker.py | 6 +++--- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/homeassistant/components/starline/device_tracker.py b/homeassistant/components/starline/device_tracker.py index 796e8ddf08c..35adbd38a4a 100644 --- a/homeassistant/components/starline/device_tracker.py +++ b/homeassistant/components/starline/device_tracker.py @@ -1,6 +1,6 @@ """StarLine device tracker.""" from homeassistant.components.device_tracker.config_entry import TrackerEntity -from homeassistant.components.device_tracker.const import SOURCE_TYPE_GPS +from homeassistant.components.device_tracker.const import SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -56,9 +56,9 @@ class StarlineDeviceTracker(StarlineEntity, TrackerEntity, RestoreEntity): return self._device.position["y"] @property - def source_type(self): + def source_type(self) -> SourceType: """Return the source type, eg gps or router, of the device.""" - return SOURCE_TYPE_GPS + return SourceType.GPS @property def icon(self): diff --git a/homeassistant/components/tile/device_tracker.py b/homeassistant/components/tile/device_tracker.py index 492c202df08..f749d500b46 100644 --- a/homeassistant/components/tile/device_tracker.py +++ b/homeassistant/components/tile/device_tracker.py @@ -7,7 +7,7 @@ from pytile.tile import Tile from homeassistant.components.device_tracker import AsyncSeeCallback from homeassistant.components.device_tracker.config_entry import TrackerEntity -from homeassistant.components.device_tracker.const import SOURCE_TYPE_GPS +from homeassistant.components.device_tracker.const import SourceType from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant, callback @@ -122,9 +122,9 @@ class TileDeviceTracker(CoordinatorEntity, TrackerEntity): return self._tile.longitude @property - def source_type(self) -> str: + def source_type(self) -> SourceType: """Return the source type, eg gps or router, of the device.""" - return SOURCE_TYPE_GPS + return SourceType.GPS @callback def _handle_coordinator_update(self) -> None: diff --git a/homeassistant/components/traccar/device_tracker.py b/homeassistant/components/traccar/device_tracker.py index f9676d37aa2..784e3c70f33 100644 --- a/homeassistant/components/traccar/device_tracker.py +++ b/homeassistant/components/traccar/device_tracker.py @@ -19,8 +19,8 @@ import voluptuous as vol from homeassistant.components.device_tracker import ( CONF_SCAN_INTERVAL, PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, - SOURCE_TYPE_GPS, AsyncSeeCallback, + SourceType, ) from homeassistant.components.device_tracker.config_entry import TrackerEntity from homeassistant.config_entries import ConfigEntry @@ -407,9 +407,9 @@ class TraccarEntity(TrackerEntity, RestoreEntity): return {"name": self._name, "identifiers": {(DOMAIN, self._unique_id)}} @property - def source_type(self): + def source_type(self) -> SourceType: """Return the source type, eg gps or router, of the device.""" - return SOURCE_TYPE_GPS + return SourceType.GPS async def async_added_to_hass(self): """Register state update callback.""" diff --git a/homeassistant/components/tractive/device_tracker.py b/homeassistant/components/tractive/device_tracker.py index 4b08defbf97..19d30aa9856 100644 --- a/homeassistant/components/tractive/device_tracker.py +++ b/homeassistant/components/tractive/device_tracker.py @@ -3,10 +3,7 @@ from __future__ import annotations from typing import Any -from homeassistant.components.device_tracker import ( - SOURCE_TYPE_BLUETOOTH, - SOURCE_TYPE_GPS, -) +from homeassistant.components.device_tracker import SourceType from homeassistant.components.device_tracker.config_entry import TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback @@ -56,11 +53,11 @@ class TractiveDeviceTracker(TractiveEntity, TrackerEntity): self._attr_unique_id = item.trackable["_id"] @property - def source_type(self) -> str: + def source_type(self) -> SourceType: """Return the source type, eg gps or router, of the device.""" if self._source_type == "PHONE": - return SOURCE_TYPE_BLUETOOTH - return SOURCE_TYPE_GPS + return SourceType.BLUETOOTH + return SourceType.GPS @property def latitude(self) -> float: diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py index f2c2230b9e0..5484bcf2d5b 100644 --- a/homeassistant/components/unifi/device_tracker.py +++ b/homeassistant/components/unifi/device_tracker.py @@ -19,7 +19,7 @@ from aiounifi.events import ( from homeassistant.components.device_tracker import DOMAIN from homeassistant.components.device_tracker.config_entry import ScannerEntity -from homeassistant.components.device_tracker.const import SOURCE_TYPE_ROUTER +from homeassistant.components.device_tracker.const import SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect @@ -276,9 +276,9 @@ class UniFiClientTracker(UniFiClientBase, ScannerEntity): return self._is_connected @property - def source_type(self): + def source_type(self) -> SourceType: """Return the source type of the client.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER @property def unique_id(self) -> str: @@ -406,9 +406,9 @@ class UniFiDeviceTracker(UniFiBase, ScannerEntity): return self._is_connected @property - def source_type(self): + def source_type(self) -> SourceType: """Return the source type of the device.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER @property def name(self) -> str: diff --git a/homeassistant/components/volvooncall/device_tracker.py b/homeassistant/components/volvooncall/device_tracker.py index 866634fc5e1..4f9300fd021 100644 --- a/homeassistant/components/volvooncall/device_tracker.py +++ b/homeassistant/components/volvooncall/device_tracker.py @@ -1,7 +1,7 @@ """Support for tracking a Volvo.""" from __future__ import annotations -from homeassistant.components.device_tracker import SOURCE_TYPE_GPS, AsyncSeeCallback +from homeassistant.components.device_tracker import AsyncSeeCallback, SourceType from homeassistant.core import HomeAssistant from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType @@ -31,7 +31,7 @@ async def async_setup_scanner( await async_see( dev_id=dev_id, host_name=host_name, - source_type=SOURCE_TYPE_GPS, + source_type=SourceType.GPS, gps=instrument.state, icon="mdi:car", ) diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py index cf4a830f4da..eed80a05055 100644 --- a/homeassistant/components/zha/device_tracker.py +++ b/homeassistant/components/zha/device_tracker.py @@ -4,7 +4,7 @@ from __future__ import annotations import functools import time -from homeassistant.components.device_tracker import SOURCE_TYPE_ROUTER +from homeassistant.components.device_tracker import SourceType from homeassistant.components.device_tracker.config_entry import ScannerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform @@ -85,9 +85,9 @@ class ZHADeviceScannerEntity(ScannerEntity, ZhaEntity): return self._connected @property - def source_type(self): + def source_type(self) -> SourceType: """Return the source type, eg gps or router, of the device.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER @callback def async_battery_percentage_remaining_updated(self, attr_id, attr_name, value):