From 5cb78653091c3000d113ca1d6b53308048d50566 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Tue, 5 Dec 2023 13:42:37 -1000 Subject: [PATCH] fix types --- homeassistant/components/bluetooth/base_scanner.py | 8 +++++--- homeassistant/components/bluetooth/models.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/bluetooth/base_scanner.py b/homeassistant/components/bluetooth/base_scanner.py index 72cd0a9220f..fc11277d768 100644 --- a/homeassistant/components/bluetooth/base_scanner.py +++ b/homeassistant/components/bluetooth/base_scanner.py @@ -16,10 +16,10 @@ from homeassistant.core import ( callback as hass_callback, ) -from .const import DATA_MANAGER +from . import models if TYPE_CHECKING: - from .manager import HomeAssistantBluetoothManager + pass class HomeAssistantRemoteScanner(BaseHaRemoteScanner): @@ -46,7 +46,9 @@ class HomeAssistantRemoteScanner(BaseHaRemoteScanner): ) -> None: """Initialize the scanner.""" self.hass = hass - manager: HomeAssistantBluetoothManager = hass.data[DATA_MANAGER] + manager = models.MANAGER + if TYPE_CHECKING: + assert manager is not None self._storage = manager.storage self._cancel_stop: CALLBACK_TYPE | None = None super().__init__(scanner_id, name, new_info_callback, connector, connectable) diff --git a/homeassistant/components/bluetooth/models.py b/homeassistant/components/bluetooth/models.py index 20e18661907..001a47767a1 100644 --- a/homeassistant/components/bluetooth/models.py +++ b/homeassistant/components/bluetooth/models.py @@ -8,10 +8,10 @@ from typing import TYPE_CHECKING from home_assistant_bluetooth import BluetoothServiceInfoBleak if TYPE_CHECKING: - from .manager import BluetoothManager + from .manager import HomeAssistantBluetoothManager -MANAGER: BluetoothManager | None = None +MANAGER: HomeAssistantBluetoothManager | None = None BluetoothChange = Enum("BluetoothChange", "ADVERTISEMENT")