jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove BLE connection state unsubscribe workaround from ESPHome (#104674)

Browse Source 
aioesphomeapi now has explict coverage to ensure calling
the unsubscribe function after the connection drops is safe
and will not raise anymore
This commit is contained in:
J. Nick Koston 2023-11-28 16:38:00 -06:00 committed by GitHub
parent bdef0ba6e5
commit de3b608e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
homeassistant/components/esphome/bluetooth/client.py
View File

@ -171,23 +171,6 @@ class ESPHomeClient(BaseBleakClient):
"""Return the string representation of the client.""" """Return the string representation of the client."""
return f"ESPHomeClient ({self._description})" return f"ESPHomeClient ({self._description})"
def _unsubscribe_connection_state(self) -> None:
"""Unsubscribe from connection state updates."""
if not self._cancel_connection_state:
return
try:
self._cancel_connection_state()
except (AssertionError, ValueError) as ex:
_LOGGER.debug(
(
"%s: Failed to unsubscribe from connection state (likely"
" connection dropped): %s"
),
self._description,
ex,
)
self._cancel_connection_state = None
def _async_disconnected_cleanup(self) -> None: def _async_disconnected_cleanup(self) -> None:
"""Clean up on disconnect.""" """Clean up on disconnect."""
self.services = BleakGATTServiceCollection() # type: ignore[no-untyped-call] self.services = BleakGATTServiceCollection() # type: ignore[no-untyped-call]
@ -196,7 +179,9 @@ class ESPHomeClient(BaseBleakClient):
notify_abort() notify_abort()
self._notify_cancels.clear() self._notify_cancels.clear()
self._disconnect_callbacks.discard(self._async_esp_disconnected) self._disconnect_callbacks.discard(self._async_esp_disconnected)
self._unsubscribe_connection_state() if self._cancel_connection_state:
self._cancel_connection_state()
self._cancel_connection_state = None
def _async_ble_device_disconnected(self) -> None: def _async_ble_device_disconnected(self) -> None:
"""Handle the BLE device disconnecting from the ESP.""" """Handle the BLE device disconnecting from the ESP."""