Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rfxtrx correct overzealous type checking (#67437)

pull/67470/head
Joakim Plate 2022-03-02 10:36:23 +01:00 committed by GitHub
parent 4ac1746e28
commit 3c3a27584a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/rfxtrx/config_flow.py
View File

@ -36,7 +36,13 @@ from homeassistant.helpers.entity_registry import (
async_get_registry as async_get_entity_registry, async_get_registry as async_get_entity_registry,
) )
from . import DOMAIN, DeviceTuple, get_device_id, get_rfx_object from . import (
DOMAIN,
DeviceTuple,
get_device_id,
get_device_tuple_from_identifiers,
get_rfx_object,
)
from .binary_sensor import supported as binary_supported from .binary_sensor import supported as binary_supported
from .const import ( from .const import (
CONF_AUTOMATIC_ADD, CONF_AUTOMATIC_ADD,
@ -64,7 +70,7 @@ RECV_MODES = sorted(itertools.chain(*rfxtrxmod.lowlevel.Status.RECMODES))
class DeviceData(TypedDict): class DeviceData(TypedDict):
"""Dict data representing a device entry.""" """Dict data representing a device entry."""
event_code: str event_code: str | None
device_id: DeviceTuple device_id: DeviceTuple
@ -398,15 +404,15 @@ class OptionsFlow(config_entries.OptionsFlow):
def _get_device_data(self, entry_id) -> DeviceData: def _get_device_data(self, entry_id) -> DeviceData:
"""Get event code based on device identifier.""" """Get event code based on device identifier."""
event_code: str event_code: str | None = None
entry = self._device_registry.async_get(entry_id) entry = self._device_registry.async_get(entry_id)
assert entry assert entry
device_id = cast(DeviceTuple, next(iter(entry.identifiers))[1:]) device_id = get_device_tuple_from_identifiers(entry.identifiers)
assert device_id
for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items(): for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
if tuple(entity_info.get(CONF_DEVICE_ID)) == device_id: if tuple(entity_info.get(CONF_DEVICE_ID)) == device_id:
event_code = cast(str, packet_id) event_code = cast(str, packet_id)
break break
assert event_code
return DeviceData(event_code=event_code, device_id=device_id) return DeviceData(event_code=event_code, device_id=device_id)
@callback @callback