Skip to content

Commit 17d3159

Browse files
Remove unneeded use of keys() in ZHA (home-assistant#86668)
Co-authored-by: Martin Hjelmare <[email protected]>
1 parent fa7ad20 commit 17d3159

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

homeassistant/components/zha/core/group.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def members(self) -> list[ZHAGroupMember]:
154154
"""Return the ZHA devices that are members of this group."""
155155
return [
156156
ZHAGroupMember(self, self._zha_gateway.devices[member_ieee], endpoint_id)
157-
for (member_ieee, endpoint_id) in self._zigpy_group.members.keys()
157+
for (member_ieee, endpoint_id) in self._zigpy_group.members
158158
if member_ieee in self._zha_gateway.devices
159159
]
160160

homeassistant/components/zha/core/helpers.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ def cluster_command_schema_to_vol_schema(schema: CommandSchema) -> vol.Schema:
136136

137137
def schema_type_to_vol(field_type: Any) -> Any:
138138
"""Convert a schema type to a voluptuous type."""
139-
if issubclass(field_type, enum.Flag) and len(field_type.__members__.keys()):
139+
if issubclass(field_type, enum.Flag) and field_type.__members__:
140140
return cv.multi_select(
141-
[key.replace("_", " ") for key in field_type.__members__.keys()]
141+
[key.replace("_", " ") for key in field_type.__members__]
142142
)
143-
if issubclass(field_type, enum.Enum) and len(field_type.__members__.keys()):
144-
return vol.In([key.replace("_", " ") for key in field_type.__members__.keys()])
143+
if issubclass(field_type, enum.Enum) and field_type.__members__:
144+
return vol.In([key.replace("_", " ") for key in field_type.__members__])
145145
if (
146146
issubclass(field_type, zigpy.types.FixedIntType)
147147
or issubclass(field_type, enum.Flag)

homeassistant/components/zha/device_trigger.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ async def async_get_triggers(
9292
return []
9393

9494
triggers = []
95-
for trigger, subtype in zha_device.device_automation_triggers.keys():
95+
for trigger, subtype in zha_device.device_automation_triggers:
9696
triggers.append(
9797
{
9898
CONF_DEVICE_ID: device_id,

0 commit comments

Comments
 (0)