From 1a8ccfeb56095b16d6de471e99c3a82471a83716 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Sun, 31 Jul 2022 15:51:04 +0200 Subject: [PATCH] Use device_tracker SourceType enum [a-g] (#75963) --- homeassistant/components/asuswrt/device_tracker.py | 6 +++--- .../components/bluetooth_le_tracker/device_tracker.py | 4 ++-- .../components/bluetooth_tracker/device_tracker.py | 4 ++-- .../components/bmw_connected_drive/device_tracker.py | 7 +++---- .../components/devolo_home_network/device_tracker.py | 6 +++--- homeassistant/components/dhcp/__init__.py | 4 ++-- homeassistant/components/freebox/device_tracker.py | 6 +++--- homeassistant/components/fritz/device_tracker.py | 6 +++--- homeassistant/components/geofency/device_tracker.py | 6 +++--- homeassistant/components/google_maps/device_tracker.py | 4 ++-- homeassistant/components/gpslogger/device_tracker.py | 6 +++--- 11 files changed, 29 insertions(+), 30 deletions(-) diff --git a/homeassistant/components/asuswrt/device_tracker.py b/homeassistant/components/asuswrt/device_tracker.py index af43294c954..fc2d4ede26d 100644 --- a/homeassistant/components/asuswrt/device_tracker.py +++ b/homeassistant/components/asuswrt/device_tracker.py @@ -1,7 +1,7 @@ """Support for ASUSWRT routers.""" from __future__ import annotations -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.core import HomeAssistant, callback @@ -69,9 +69,9 @@ class AsusWrtDevice(ScannerEntity): return self._device.is_connected @property - def source_type(self) -> str: + def source_type(self) -> SourceType: """Return the source type.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER @property def hostname(self) -> str | None: diff --git a/homeassistant/components/bluetooth_le_tracker/device_tracker.py b/homeassistant/components/bluetooth_le_tracker/device_tracker.py index 6ba33e506cc..b416fe3e070 100644 --- a/homeassistant/components/bluetooth_le_tracker/device_tracker.py +++ b/homeassistant/components/bluetooth_le_tracker/device_tracker.py @@ -16,7 +16,7 @@ from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker.const import ( CONF_TRACK_NEW, SCAN_INTERVAL, - SOURCE_TYPE_BLUETOOTH_LE, + SourceType, ) from homeassistant.components.device_tracker.legacy import ( YAML_DEVICES, @@ -106,7 +106,7 @@ async def async_setup_scanner( # noqa: C901 await async_see( mac=BLE_PREFIX + address, host_name=name, - source_type=SOURCE_TYPE_BLUETOOTH_LE, + source_type=SourceType.BLUETOOTH_LE, battery=battery, ) diff --git a/homeassistant/components/bluetooth_tracker/device_tracker.py b/homeassistant/components/bluetooth_tracker/device_tracker.py index 90ae473a0cd..d266ba5d542 100644 --- a/homeassistant/components/bluetooth_tracker/device_tracker.py +++ b/homeassistant/components/bluetooth_tracker/device_tracker.py @@ -19,7 +19,7 @@ from homeassistant.components.device_tracker.const import ( CONF_TRACK_NEW, DEFAULT_TRACK_NEW, SCAN_INTERVAL, - SOURCE_TYPE_BLUETOOTH, + SourceType, ) from homeassistant.components.device_tracker.legacy import ( YAML_DEVICES, @@ -93,7 +93,7 @@ async def see_device( mac=f"{BT_PREFIX}{mac}", host_name=device_name, attributes=attributes, - source_type=SOURCE_TYPE_BLUETOOTH, + source_type=SourceType.BLUETOOTH, ) diff --git a/homeassistant/components/bmw_connected_drive/device_tracker.py b/homeassistant/components/bmw_connected_drive/device_tracker.py index dc71100455d..c06ecdaa9bb 100644 --- a/homeassistant/components/bmw_connected_drive/device_tracker.py +++ b/homeassistant/components/bmw_connected_drive/device_tracker.py @@ -2,11 +2,10 @@ from __future__ import annotations import logging -from typing import Literal from bimmer_connected.vehicle import MyBMWVehicle -from homeassistant.components.device_tracker import 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 @@ -80,6 +79,6 @@ class BMWDeviceTracker(BMWBaseEntity, TrackerEntity): ) @property - def source_type(self) -> Literal["gps"]: + def source_type(self) -> SourceType: """Return the source type, eg gps or router, of the device.""" - return SOURCE_TYPE_GPS + return SourceType.GPS diff --git a/homeassistant/components/devolo_home_network/device_tracker.py b/homeassistant/components/devolo_home_network/device_tracker.py index 9dffeef7db9..0e3e47d9320 100644 --- a/homeassistant/components/devolo_home_network/device_tracker.py +++ b/homeassistant/components/devolo_home_network/device_tracker.py @@ -7,7 +7,7 @@ from devolo_plc_api.device import Device from homeassistant.components.device_tracker import ( DOMAIN as DEVICE_TRACKER_DOMAIN, - SOURCE_TYPE_ROUTER, + SourceType, ) from homeassistant.components.device_tracker.config_entry import ScannerEntity from homeassistant.config_entries import ConfigEntry @@ -149,9 +149,9 @@ class DevoloScannerEntity(CoordinatorEntity, ScannerEntity): return self._mac @property - def source_type(self) -> str: + def source_type(self) -> SourceType: """Return tracker source type.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER @property def unique_id(self) -> str: diff --git a/homeassistant/components/dhcp/__init__.py b/homeassistant/components/dhcp/__init__.py index 8581a5f2241..be9cbd7426d 100644 --- a/homeassistant/components/dhcp/__init__.py +++ b/homeassistant/components/dhcp/__init__.py @@ -31,7 +31,7 @@ from homeassistant.components.device_tracker.const import ( ATTR_SOURCE_TYPE, CONNECTED_DEVICE_REGISTERED, DOMAIN as DEVICE_TRACKER_DOMAIN, - SOURCE_TYPE_ROUTER, + SourceType, ) from homeassistant.const import ( EVENT_HOMEASSISTANT_STARTED, @@ -318,7 +318,7 @@ class DeviceTrackerWatcher(WatcherBase): attributes = state.attributes - if attributes.get(ATTR_SOURCE_TYPE) != SOURCE_TYPE_ROUTER: + if attributes.get(ATTR_SOURCE_TYPE) != SourceType.ROUTER: return ip_address = attributes.get(ATTR_IP) diff --git a/homeassistant/components/freebox/device_tracker.py b/homeassistant/components/freebox/device_tracker.py index 0fe04fe7eb9..1fd7a35e975 100644 --- a/homeassistant/components/freebox/device_tracker.py +++ b/homeassistant/components/freebox/device_tracker.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import datetime from typing import Any -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.core import HomeAssistant, callback @@ -98,9 +98,9 @@ class FreeboxDevice(ScannerEntity): return self._active @property - def source_type(self) -> str: + def source_type(self) -> SourceType: """Return the source type.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER @property def icon(self) -> str: diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py index 34c3f64e1e5..9591fec156b 100644 --- a/homeassistant/components/fritz/device_tracker.py +++ b/homeassistant/components/fritz/device_tracker.py @@ -4,7 +4,7 @@ from __future__ import annotations import datetime import logging -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.core import HomeAssistant, callback @@ -118,6 +118,6 @@ class FritzBoxTracker(FritzDeviceBase, ScannerEntity): return attrs @property - def source_type(self) -> str: + def source_type(self) -> SourceType: """Return tracker source type.""" - return SOURCE_TYPE_ROUTER + return SourceType.ROUTER diff --git a/homeassistant/components/geofency/device_tracker.py b/homeassistant/components/geofency/device_tracker.py index bd4b2852019..61deb9ede7d 100644 --- a/homeassistant/components/geofency/device_tracker.py +++ b/homeassistant/components/geofency/device_tracker.py @@ -1,5 +1,5 @@ """Support for the Geofency device tracker platform.""" -from homeassistant.components.device_tracker import 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.const import ATTR_LATITUDE, ATTR_LONGITUDE @@ -96,9 +96,9 @@ class GeofencyEntity(TrackerEntity, RestoreEntity): return DeviceInfo(identifiers={(GF_DOMAIN, self._unique_id)}, name=self._name) @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/google_maps/device_tracker.py b/homeassistant/components/google_maps/device_tracker.py index 8d8be8c0fe1..8f15278e214 100644 --- a/homeassistant/components/google_maps/device_tracker.py +++ b/homeassistant/components/google_maps/device_tracker.py @@ -10,8 +10,8 @@ import voluptuous as vol from homeassistant.components.device_tracker import ( PLATFORM_SCHEMA as PLATFORM_SCHEMA_BASE, - SOURCE_TYPE_GPS, SeeCallback, + SourceType, ) from homeassistant.const import ( ATTR_BATTERY_CHARGING, @@ -129,7 +129,7 @@ class GoogleMapsScanner: dev_id=dev_id, gps=(person.latitude, person.longitude), picture=person.picture_url, - source_type=SOURCE_TYPE_GPS, + source_type=SourceType.GPS, gps_accuracy=person.accuracy, attributes=attrs, ) diff --git a/homeassistant/components/gpslogger/device_tracker.py b/homeassistant/components/gpslogger/device_tracker.py index ea648ed7495..22e9529706f 100644 --- a/homeassistant/components/gpslogger/device_tracker.py +++ b/homeassistant/components/gpslogger/device_tracker.py @@ -1,5 +1,5 @@ """Support for the GPSLogger device tracking.""" -from homeassistant.components.device_tracker import 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.const import ( @@ -118,9 +118,9 @@ class GPSLoggerEntity(TrackerEntity, RestoreEntity): return DeviceInfo(identifiers={(GPL_DOMAIN, self._unique_id)}, name=self._name) @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."""