From 2214fff3b492a9b24ef4679653b4f2e53f79ee69 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Fri, 28 Oct 2022 17:40:37 +0200 Subject: [PATCH] Cleanup device_tracker imports (#81139) --- homeassistant/components/asuswrt/device_tracker.py | 3 +-- .../components/devolo_home_network/device_tracker.py | 2 +- homeassistant/components/fritz/device_tracker.py | 3 +-- homeassistant/components/geofency/device_tracker.py | 3 +-- homeassistant/components/gpslogger/device_tracker.py | 3 +-- homeassistant/components/huawei_lte/device_tracker.py | 2 +- homeassistant/components/icloud/device_tracker.py | 3 +-- homeassistant/components/keenetic_ndms2/device_tracker.py | 2 +- homeassistant/components/life360/device_tracker.py | 3 +-- homeassistant/components/locative/device_tracker.py | 3 +-- homeassistant/components/mazda/device_tracker.py | 3 +-- homeassistant/components/mikrotik/device_tracker.py | 7 +++++-- homeassistant/components/mobile_app/device_tracker.py | 2 +- homeassistant/components/netgear/device_tracker.py | 3 +-- homeassistant/components/nmap_tracker/device_tracker.py | 3 +-- homeassistant/components/owntracks/device_tracker.py | 8 ++++++-- homeassistant/components/renault/device_tracker.py | 3 +-- .../components/ruckus_unleashed/device_tracker.py | 3 +-- homeassistant/components/starline/device_tracker.py | 3 +-- homeassistant/components/tile/device_tracker.py | 7 +++++-- homeassistant/components/traccar/device_tracker.py | 2 +- homeassistant/components/tractive/device_tracker.py | 3 +-- homeassistant/components/unifi/device_tracker.py | 3 +-- homeassistant/components/volvooncall/device_tracker.py | 3 +-- homeassistant/components/zha/device_tracker.py | 3 +-- 25 files changed, 38 insertions(+), 45 deletions(-) diff --git a/homeassistant/components/asuswrt/device_tracker.py b/homeassistant/components/asuswrt/device_tracker.py index efdf4993927..3a9abdd7e85 100644 --- a/homeassistant/components/asuswrt/device_tracker.py +++ b/homeassistant/components/asuswrt/device_tracker.py @@ -1,8 +1,7 @@ """Support for ASUSWRT routers.""" from __future__ import annotations -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/devolo_home_network/device_tracker.py b/homeassistant/components/devolo_home_network/device_tracker.py index f535136680a..26b30ec43d5 100644 --- a/homeassistant/components/devolo_home_network/device_tracker.py +++ b/homeassistant/components/devolo_home_network/device_tracker.py @@ -7,9 +7,9 @@ from devolo_plc_api.device import Device from homeassistant.components.device_tracker import ( DOMAIN as DEVICE_TRACKER_DOMAIN, + ScannerEntity, SourceType, ) -from homeassistant.components.device_tracker.config_entry import ScannerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import FREQUENCY_GIGAHERTZ, STATE_UNKNOWN from homeassistant.core import HomeAssistant, callback diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py index 998eab2ede7..212710a638c 100644 --- a/homeassistant/components/fritz/device_tracker.py +++ b/homeassistant/components/fritz/device_tracker.py @@ -4,8 +4,7 @@ from __future__ import annotations import datetime import logging -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/geofency/device_tracker.py b/homeassistant/components/geofency/device_tracker.py index 85197239ccd..cc47883d05a 100644 --- a/homeassistant/components/geofency/device_tracker.py +++ b/homeassistant/components/geofency/device_tracker.py @@ -1,6 +1,5 @@ """Support for the Geofency device tracker platform.""" -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE from homeassistant.core import HomeAssistant, callback diff --git a/homeassistant/components/gpslogger/device_tracker.py b/homeassistant/components/gpslogger/device_tracker.py index f18b486917a..a452d32e544 100644 --- a/homeassistant/components/gpslogger/device_tracker.py +++ b/homeassistant/components/gpslogger/device_tracker.py @@ -1,6 +1,5 @@ """Support for the GPSLogger device tracking.""" -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_BATTERY_LEVEL, diff --git a/homeassistant/components/huawei_lte/device_tracker.py b/homeassistant/components/huawei_lte/device_tracker.py index f97bda7481e..917250eae79 100644 --- a/homeassistant/components/huawei_lte/device_tracker.py +++ b/homeassistant/components/huawei_lte/device_tracker.py @@ -10,9 +10,9 @@ from stringcase import snakecase from homeassistant.components.device_tracker import ( DOMAIN as DEVICE_TRACKER_DOMAIN, + ScannerEntity, SourceType, ) -from homeassistant.components.device_tracker.config_entry import ScannerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry diff --git a/homeassistant/components/icloud/device_tracker.py b/homeassistant/components/icloud/device_tracker.py index fc1de213a69..d9bd215d2a1 100644 --- a/homeassistant/components/icloud/device_tracker.py +++ b/homeassistant/components/icloud/device_tracker.py @@ -3,8 +3,7 @@ from __future__ import annotations from typing import Any -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/keenetic_ndms2/device_tracker.py b/homeassistant/components/keenetic_ndms2/device_tracker.py index 4491b644b27..fd4265a4ef0 100644 --- a/homeassistant/components/keenetic_ndms2/device_tracker.py +++ b/homeassistant/components/keenetic_ndms2/device_tracker.py @@ -7,9 +7,9 @@ from ndms2_client import Device from homeassistant.components.device_tracker import ( DOMAIN as DEVICE_TRACKER_DOMAIN, + ScannerEntity, SourceType, ) -from homeassistant.components.device_tracker.config_entry import ScannerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry diff --git a/homeassistant/components/life360/device_tracker.py b/homeassistant/components/life360/device_tracker.py index a6ca0a16aa3..74ab63f88a1 100644 --- a/homeassistant/components/life360/device_tracker.py +++ b/homeassistant/components/life360/device_tracker.py @@ -6,8 +6,7 @@ from collections.abc import Mapping from contextlib import suppress from typing import Any, cast -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_BATTERY_CHARGING from homeassistant.core import HomeAssistant, callback diff --git a/homeassistant/components/locative/device_tracker.py b/homeassistant/components/locative/device_tracker.py index f8fa1671034..2ec1e7437de 100644 --- a/homeassistant/components/locative/device_tracker.py +++ b/homeassistant/components/locative/device_tracker.py @@ -1,6 +1,5 @@ """Support for the Locative platform.""" -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/mazda/device_tracker.py b/homeassistant/components/mazda/device_tracker.py index 946cff72f5b..67702ba5455 100644 --- a/homeassistant/components/mazda/device_tracker.py +++ b/homeassistant/components/mazda/device_tracker.py @@ -1,6 +1,5 @@ """Platform for Mazda device tracker integration.""" -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/mikrotik/device_tracker.py b/homeassistant/components/mikrotik/device_tracker.py index cfa2e216d1d..2c3e480c297 100644 --- a/homeassistant/components/mikrotik/device_tracker.py +++ b/homeassistant/components/mikrotik/device_tracker.py @@ -3,8 +3,11 @@ from __future__ import annotations from typing import Any -from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER, SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ( + DOMAIN as DEVICE_TRACKER, + ScannerEntity, + SourceType, +) from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry diff --git a/homeassistant/components/mobile_app/device_tracker.py b/homeassistant/components/mobile_app/device_tracker.py index 6f9c68224ec..d347a0cc4db 100644 --- a/homeassistant/components/mobile_app/device_tracker.py +++ b/homeassistant/components/mobile_app/device_tracker.py @@ -5,8 +5,8 @@ from homeassistant.components.device_tracker import ( ATTR_GPS_ACCURACY, ATTR_LOCATION_NAME, SourceType, + TrackerEntity, ) -from homeassistant.components.device_tracker.config_entry import TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_BATTERY_LEVEL, diff --git a/homeassistant/components/netgear/device_tracker.py b/homeassistant/components/netgear/device_tracker.py index 5feff521efa..ffb33d5ebeb 100644 --- a/homeassistant/components/netgear/device_tracker.py +++ b/homeassistant/components/netgear/device_tracker.py @@ -3,8 +3,7 @@ from __future__ import annotations import logging -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/nmap_tracker/device_tracker.py b/homeassistant/components/nmap_tracker/device_tracker.py index 9203288f03a..bada45256a8 100644 --- a/homeassistant/components/nmap_tracker/device_tracker.py +++ b/homeassistant/components/nmap_tracker/device_tracker.py @@ -4,8 +4,7 @@ from __future__ import annotations import logging from typing import Any -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py index b65ac9ccbe7..f983d0f98d4 100644 --- a/homeassistant/components/owntracks/device_tracker.py +++ b/homeassistant/components/owntracks/device_tracker.py @@ -1,6 +1,10 @@ """Device tracker platform that adds support for OwnTracks over MQTT.""" -from homeassistant.components.device_tracker import ATTR_SOURCE_TYPE, DOMAIN, SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import ( + ATTR_SOURCE_TYPE, + DOMAIN, + SourceType, + TrackerEntity, +) from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_BATTERY_LEVEL, diff --git a/homeassistant/components/renault/device_tracker.py b/homeassistant/components/renault/device_tracker.py index da267277d10..87ca3c9eb5f 100644 --- a/homeassistant/components/renault/device_tracker.py +++ b/homeassistant/components/renault/device_tracker.py @@ -3,8 +3,7 @@ from __future__ import annotations from renault_api.kamereon.models import KamereonVehicleLocationData -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/ruckus_unleashed/device_tracker.py b/homeassistant/components/ruckus_unleashed/device_tracker.py index c9d9df6068e..5e8998c47dd 100644 --- a/homeassistant/components/ruckus_unleashed/device_tracker.py +++ b/homeassistant/components/ruckus_unleashed/device_tracker.py @@ -1,8 +1,7 @@ """Support for Ruckus Unleashed devices.""" from __future__ import annotations -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry diff --git a/homeassistant/components/starline/device_tracker.py b/homeassistant/components/starline/device_tracker.py index e01807ba702..6dadfdbd3ea 100644 --- a/homeassistant/components/starline/device_tracker.py +++ b/homeassistant/components/starline/device_tracker.py @@ -1,6 +1,5 @@ """StarLine device tracker.""" -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/tile/device_tracker.py b/homeassistant/components/tile/device_tracker.py index 86afee18505..7931bbb8797 100644 --- a/homeassistant/components/tile/device_tracker.py +++ b/homeassistant/components/tile/device_tracker.py @@ -5,8 +5,11 @@ import logging from pytile.tile import Tile -from homeassistant.components.device_tracker import AsyncSeeCallback, SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import ( + AsyncSeeCallback, + SourceType, + TrackerEntity, +) from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant, callback diff --git a/homeassistant/components/traccar/device_tracker.py b/homeassistant/components/traccar/device_tracker.py index 1f6b0b828bd..601229ed2e0 100644 --- a/homeassistant/components/traccar/device_tracker.py +++ b/homeassistant/components/traccar/device_tracker.py @@ -22,8 +22,8 @@ from homeassistant.components.device_tracker import ( PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, AsyncSeeCallback, SourceType, + TrackerEntity, ) -from homeassistant.components.device_tracker.config_entry import TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_EVENT, diff --git a/homeassistant/components/tractive/device_tracker.py b/homeassistant/components/tractive/device_tracker.py index f92a8e71df3..0cb73723369 100644 --- a/homeassistant/components/tractive/device_tracker.py +++ b/homeassistant/components/tractive/device_tracker.py @@ -3,8 +3,7 @@ from __future__ import annotations from typing import Any -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py index 1c91ea4724b..ea8db77e124 100644 --- a/homeassistant/components/unifi/device_tracker.py +++ b/homeassistant/components/unifi/device_tracker.py @@ -6,8 +6,7 @@ import logging from aiounifi.models.api import SOURCE_DATA, SOURCE_EVENT from aiounifi.models.event import EventKey -from homeassistant.components.device_tracker import DOMAIN, SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import DOMAIN, ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/volvooncall/device_tracker.py b/homeassistant/components/volvooncall/device_tracker.py index 159cb39cf6a..0cd61a336b7 100644 --- a/homeassistant/components/volvooncall/device_tracker.py +++ b/homeassistant/components/volvooncall/device_tracker.py @@ -3,8 +3,7 @@ from __future__ import annotations from volvooncall.dashboard import Instrument -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker import SourceType, TrackerEntity from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py index 8ecc85a4e56..1a636ce65a2 100644 --- a/homeassistant/components/zha/device_tracker.py +++ b/homeassistant/components/zha/device_tracker.py @@ -4,8 +4,7 @@ from __future__ import annotations import functools import time -from homeassistant.components.device_tracker import SourceType -from homeassistant.components.device_tracker.config_entry import ScannerEntity +from homeassistant.components.device_tracker import ScannerEntity, SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform from homeassistant.core import HomeAssistant, callback