Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 21:06:19 +00:00
Code Activity

Don't require passing identifiers to DeviceRegistry.async_get_device (#96479)

Browse Source 
* Require keyword arguments to DeviceRegistry.async_get_device

* Update tests

* Update tests

* Don't enforce keyword arguments
This commit is contained in:
Erik Montnemery
2023-07-13 19:39:25 +02:00
committed by GitHub
parent 5f46436057
commit 7539cf25be
143 changed files with 654 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/helpers/device_registry.py
View File

@@ -272,13 +272,14 @@ class DeviceRegistryItems(UserDict[str, _EntryTypeT]):
def get_entry(
self,
identifiers: set[tuple[str, str]],
identifiers: set[tuple[str, str]] | None,
connections: set[tuple[str, str]] | None,
) -> _EntryTypeT | None:
"""Get entry from identifiers or connections."""
for identifier in identifiers:
if identifier in self._identifiers:
return self._identifiers[identifier]
if identifiers:
for identifier in identifiers:
if identifier in self._identifiers:
return self._identifiers[identifier]
if not connections:
return None
for connection in _normalize_connections(connections):
@@ -317,7 +318,7 @@ class DeviceRegistry:
@callback
def async_get_device(
self,
identifiers: set[tuple[str, str]],
identifiers: set[tuple[str, str]] | None = None,
connections: set[tuple[str, str]] | None = None,
) -> DeviceEntry | None:
"""Check if device is registered."""
@@ -326,7 +327,7 @@ class DeviceRegistry:
def _async_get_deleted_device(
self,
identifiers: set[tuple[str, str]],
connections: set[tuple[str, str]] | None,
connections: set[tuple[str, str]],
) -> DeletedDeviceEntry | None:
"""Check if device is deleted."""
return self.deleted_devices.get_entry(identifiers, connections)
@@ -365,7 +366,7 @@ class DeviceRegistry:
else:
connections = _normalize_connections(connections)
device = self.async_get_device(identifiers, connections)
device = self.async_get_device(identifiers=identifiers, connections=connections)
if device is None:
deleted_device = self._async_get_deleted_device(identifiers, connections)
@@ -388,7 +389,7 @@ class DeviceRegistry:
name = default_name
if via_device is not None:
via = self.async_get_device({via_device})
via = self.async_get_device(identifiers={via_device})
via_device_id: str | UndefinedType = via.id if via else UNDEFINED
else:
via_device_id = UNDEFINED