Skip to content

Commit

Permalink
Remove unneeded use of keys() in ZHA (home-assistant#86668)
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Hjelmare <[email protected]>
  • Loading branch information
frenck and MartinHjelmare authored Jan 26, 2023
1 parent fa7ad20 commit 17d3159
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion homeassistant/components/zha/core/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def members(self) -> list[ZHAGroupMember]:
"""Return the ZHA devices that are members of this group."""
return [
ZHAGroupMember(self, self._zha_gateway.devices[member_ieee], endpoint_id)
for (member_ieee, endpoint_id) in self._zigpy_group.members.keys()
for (member_ieee, endpoint_id) in self._zigpy_group.members
if member_ieee in self._zha_gateway.devices
]

Expand Down
8 changes: 4 additions & 4 deletions homeassistant/components/zha/core/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,12 @@ def cluster_command_schema_to_vol_schema(schema: CommandSchema) -> vol.Schema:

def schema_type_to_vol(field_type: Any) -> Any:
"""Convert a schema type to a voluptuous type."""
if issubclass(field_type, enum.Flag) and len(field_type.__members__.keys()):
if issubclass(field_type, enum.Flag) and field_type.__members__:
return cv.multi_select(
[key.replace("_", " ") for key in field_type.__members__.keys()]
[key.replace("_", " ") for key in field_type.__members__]
)
if issubclass(field_type, enum.Enum) and len(field_type.__members__.keys()):
return vol.In([key.replace("_", " ") for key in field_type.__members__.keys()])
if issubclass(field_type, enum.Enum) and field_type.__members__:
return vol.In([key.replace("_", " ") for key in field_type.__members__])
if (
issubclass(field_type, zigpy.types.FixedIntType)
or issubclass(field_type, enum.Flag)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/zha/device_trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ async def async_get_triggers(
return []

triggers = []
for trigger, subtype in zha_device.device_automation_triggers.keys():
for trigger, subtype in zha_device.device_automation_triggers:
triggers.append(
{
CONF_DEVICE_ID: device_id,
Expand Down

0 comments on commit 17d3159

Please sign in to comment.