From 17d3159e775b22bc567e574929d0a2efd8771e64 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 26 Jan 2023 11:02:46 +0100 Subject: [PATCH] Remove unneeded use of keys() in ZHA (#86668) Co-authored-by: Martin Hjelmare --- homeassistant/components/zha/core/group.py | 2 +- homeassistant/components/zha/core/helpers.py | 8 ++++---- homeassistant/components/zha/device_trigger.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/zha/core/group.py b/homeassistant/components/zha/core/group.py index b0e6a181f25f5..82997dc2a531d 100644 --- a/homeassistant/components/zha/core/group.py +++ b/homeassistant/components/zha/core/group.py @@ -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 ] diff --git a/homeassistant/components/zha/core/helpers.py b/homeassistant/components/zha/core/helpers.py index 431ab8620fc87..e2d8ff8baee17 100644 --- a/homeassistant/components/zha/core/helpers.py +++ b/homeassistant/components/zha/core/helpers.py @@ -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) diff --git a/homeassistant/components/zha/device_trigger.py b/homeassistant/components/zha/device_trigger.py index 03a13f317f36f..9e33e3fa6159a 100644 --- a/homeassistant/components/zha/device_trigger.py +++ b/homeassistant/components/zha/device_trigger.py @@ -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,