From b5402f9b57cf5e5fa37f0dd7fe0f9122df416a46 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Tue, 13 Sep 2022 02:50:44 +0200 Subject: [PATCH] Import device tracker constants from root (#78242) --- homeassistant/components/asuswrt/config_flow.py | 2 +- homeassistant/components/asuswrt/router.py | 2 +- .../components/bluetooth_le_tracker/device_tracker.py | 4 +--- .../components/bluetooth_tracker/device_tracker.py | 4 +--- homeassistant/components/dhcp/__init__.py | 2 +- homeassistant/components/fritz/common.py | 4 ++-- homeassistant/components/fritz/config_flow.py | 2 +- homeassistant/components/huawei_lte/device_tracker.py | 4 ++-- homeassistant/components/keenetic_ndms2/const.py | 2 +- homeassistant/components/mikrotik/device_tracker.py | 5 +---- homeassistant/components/mobile_app/device_tracker.py | 2 +- homeassistant/components/nmap_tracker/__init__.py | 2 +- homeassistant/components/nmap_tracker/config_flow.py | 2 +- homeassistant/components/owntracks/device_tracker.py | 6 +----- homeassistant/components/ping/device_tracker.py | 6 ++---- homeassistant/components/starline/device_tracker.py | 2 +- homeassistant/components/tile/device_tracker.py | 3 +-- homeassistant/components/unifi/device_tracker.py | 3 +-- 18 files changed, 21 insertions(+), 36 deletions(-) diff --git a/homeassistant/components/asuswrt/config_flow.py b/homeassistant/components/asuswrt/config_flow.py index ec5cccb9a71..94843a4c07c 100644 --- a/homeassistant/components/asuswrt/config_flow.py +++ b/homeassistant/components/asuswrt/config_flow.py @@ -9,7 +9,7 @@ from typing import Any import voluptuous as vol -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME, ) diff --git a/homeassistant/components/asuswrt/router.py b/homeassistant/components/asuswrt/router.py index f68c77a2a66..a48e1374b6d 100644 --- a/homeassistant/components/asuswrt/router.py +++ b/homeassistant/components/asuswrt/router.py @@ -8,7 +8,7 @@ from typing import Any from aioasuswrt.asuswrt import AsusWrt, Device as WrtDevice -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME, DOMAIN as TRACKER_DOMAIN, diff --git a/homeassistant/components/bluetooth_le_tracker/device_tracker.py b/homeassistant/components/bluetooth_le_tracker/device_tracker.py index 85908cc1d55..179d038e96e 100644 --- a/homeassistant/components/bluetooth_le_tracker/device_tracker.py +++ b/homeassistant/components/bluetooth_le_tracker/device_tracker.py @@ -12,10 +12,8 @@ import voluptuous as vol from homeassistant.components import bluetooth from homeassistant.components.bluetooth.match import BluetoothCallbackMatcher from homeassistant.components.device_tracker import ( - PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, -) -from homeassistant.components.device_tracker.const import ( CONF_TRACK_NEW, + PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, SCAN_INTERVAL, SourceType, ) diff --git a/homeassistant/components/bluetooth_tracker/device_tracker.py b/homeassistant/components/bluetooth_tracker/device_tracker.py index d266ba5d542..ce8f6ca8006 100644 --- a/homeassistant/components/bluetooth_tracker/device_tracker.py +++ b/homeassistant/components/bluetooth_tracker/device_tracker.py @@ -12,12 +12,10 @@ from bt_proximity import BluetoothRSSI import voluptuous as vol from homeassistant.components.device_tracker import ( - PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, -) -from homeassistant.components.device_tracker.const import ( CONF_SCAN_INTERVAL, CONF_TRACK_NEW, DEFAULT_TRACK_NEW, + PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, SCAN_INTERVAL, SourceType, ) diff --git a/homeassistant/components/dhcp/__init__.py b/homeassistant/components/dhcp/__init__.py index 7a5854fc53e..ab8787f4bff 100644 --- a/homeassistant/components/dhcp/__init__.py +++ b/homeassistant/components/dhcp/__init__.py @@ -26,7 +26,7 @@ from scapy.config import conf from scapy.error import Scapy_Exception from homeassistant import config_entries -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( ATTR_HOST_NAME, ATTR_IP, ATTR_MAC, diff --git a/homeassistant/components/fritz/common.py b/homeassistant/components/fritz/common.py index 610dcab6aaa..d424b38ec24 100644 --- a/homeassistant/components/fritz/common.py +++ b/homeassistant/components/fritz/common.py @@ -20,10 +20,10 @@ from fritzconnection.lib.fritzhosts import FritzHosts from fritzconnection.lib.fritzstatus import FritzStatus from fritzconnection.lib.fritzwlan import DEFAULT_PASSWORD_LENGTH, FritzGuestWLAN -from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME, + DOMAIN as DEVICE_TRACKER_DOMAIN, ) from homeassistant.components.switch import DOMAIN as DEVICE_SWITCH_DOMAIN from homeassistant.config_entries import ConfigEntry diff --git a/homeassistant/components/fritz/config_flow.py b/homeassistant/components/fritz/config_flow.py index ea6461cef32..df0277494ec 100644 --- a/homeassistant/components/fritz/config_flow.py +++ b/homeassistant/components/fritz/config_flow.py @@ -13,7 +13,7 @@ from fritzconnection.core.exceptions import FritzConnectionException, FritzSecur import voluptuous as vol from homeassistant.components import ssdp -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME, ) diff --git a/homeassistant/components/huawei_lte/device_tracker.py b/homeassistant/components/huawei_lte/device_tracker.py index 18d797aefc6..f97bda7481e 100644 --- a/homeassistant/components/huawei_lte/device_tracker.py +++ b/homeassistant/components/huawei_lte/device_tracker.py @@ -8,11 +8,11 @@ from typing import Any, cast from stringcase import snakecase -from homeassistant.components.device_tracker.config_entry import ScannerEntity -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( DOMAIN as DEVICE_TRACKER_DOMAIN, 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/keenetic_ndms2/const.py b/homeassistant/components/keenetic_ndms2/const.py index c07fb0a0d15..0b415a9502f 100644 --- a/homeassistant/components/keenetic_ndms2/const.py +++ b/homeassistant/components/keenetic_ndms2/const.py @@ -1,6 +1,6 @@ """Constants used in the Keenetic NDMS2 components.""" -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( DEFAULT_CONSIDER_HOME as _DEFAULT_CONSIDER_HOME, ) diff --git a/homeassistant/components/mikrotik/device_tracker.py b/homeassistant/components/mikrotik/device_tracker.py index f50c49d5ab6..8e112e2ee03 100644 --- a/homeassistant/components/mikrotik/device_tracker.py +++ b/homeassistant/components/mikrotik/device_tracker.py @@ -3,11 +3,8 @@ 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.const import ( - DOMAIN as DEVICE_TRACKER, - 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 ef1acdaf32d..6f9c68224ec 100644 --- a/homeassistant/components/mobile_app/device_tracker.py +++ b/homeassistant/components/mobile_app/device_tracker.py @@ -4,9 +4,9 @@ from homeassistant.components.device_tracker import ( ATTR_GPS, ATTR_GPS_ACCURACY, ATTR_LOCATION_NAME, + SourceType, ) from homeassistant.components.device_tracker.config_entry import TrackerEntity -from homeassistant.components.device_tracker.const import SourceType from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_BATTERY_LEVEL, diff --git a/homeassistant/components/nmap_tracker/__init__.py b/homeassistant/components/nmap_tracker/__init__.py index 5f3333ec750..e3b83f8abc2 100644 --- a/homeassistant/components/nmap_tracker/__init__.py +++ b/homeassistant/components/nmap_tracker/__init__.py @@ -14,7 +14,7 @@ from getmac import get_mac_address from mac_vendor_lookup import AsyncMacLookup from nmap import PortScanner, PortScannerError -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( CONF_CONSIDER_HOME, CONF_SCAN_INTERVAL, DEFAULT_CONSIDER_HOME, diff --git a/homeassistant/components/nmap_tracker/config_flow.py b/homeassistant/components/nmap_tracker/config_flow.py index 42e84af2eaa..f3008a8c6d7 100644 --- a/homeassistant/components/nmap_tracker/config_flow.py +++ b/homeassistant/components/nmap_tracker/config_flow.py @@ -8,7 +8,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import network -from homeassistant.components.device_tracker.const import ( +from homeassistant.components.device_tracker import ( CONF_CONSIDER_HOME, CONF_SCAN_INTERVAL, DEFAULT_CONSIDER_HOME, diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py index 70b8bde6de1..79efee6bd2c 100644 --- a/homeassistant/components/owntracks/device_tracker.py +++ b/homeassistant/components/owntracks/device_tracker.py @@ -1,10 +1,6 @@ """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.const import ( - ATTR_SOURCE_TYPE, - DOMAIN, - SourceType, -) from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_BATTERY_LEVEL, diff --git a/homeassistant/components/ping/device_tracker.py b/homeassistant/components/ping/device_tracker.py index 52285350cd4..b4266c8e9a7 100644 --- a/homeassistant/components/ping/device_tracker.py +++ b/homeassistant/components/ping/device_tracker.py @@ -11,12 +11,10 @@ import voluptuous as vol from homeassistant import const, util from homeassistant.components.device_tracker import ( - PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA, - AsyncSeeCallback, -) -from homeassistant.components.device_tracker.const import ( CONF_SCAN_INTERVAL, + PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA, SCAN_INTERVAL, + AsyncSeeCallback, SourceType, ) from homeassistant.core import HomeAssistant diff --git a/homeassistant/components/starline/device_tracker.py b/homeassistant/components/starline/device_tracker.py index 35adbd38a4a..e01807ba702 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 import SourceType from homeassistant.components.device_tracker.config_entry import TrackerEntity -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 diff --git a/homeassistant/components/tile/device_tracker.py b/homeassistant/components/tile/device_tracker.py index f749d500b46..86afee18505 100644 --- a/homeassistant/components/tile/device_tracker.py +++ b/homeassistant/components/tile/device_tracker.py @@ -5,9 +5,8 @@ import logging from pytile.tile import Tile -from homeassistant.components.device_tracker import AsyncSeeCallback +from homeassistant.components.device_tracker import AsyncSeeCallback, SourceType from homeassistant.components.device_tracker.config_entry import TrackerEntity -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 diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py index 5484bcf2d5b..fc9c41ce184 100644 --- a/homeassistant/components/unifi/device_tracker.py +++ b/homeassistant/components/unifi/device_tracker.py @@ -17,9 +17,8 @@ from aiounifi.events import ( WIRELESS_GUEST_ROAMRADIO, ) -from homeassistant.components.device_tracker import DOMAIN +from homeassistant.components.device_tracker import DOMAIN, SourceType from homeassistant.components.device_tracker.config_entry import ScannerEntity -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