From 5ccc3c17d9d8641edfee3efa266806a3a4025bcd Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 13 Sep 2021 13:46:21 +0200 Subject: [PATCH] Use list comprehension in onewire entity descriptions (#56168) * Use list comprehension in onewire binary sensors * Use list comprehension in onewire switches --- .../components/onewire/binary_sensor.py | 74 ++------ homeassistant/components/onewire/const.py | 3 + homeassistant/components/onewire/switch.py | 168 +++++------------- 3 files changed, 65 insertions(+), 180 deletions(-) diff --git a/homeassistant/components/onewire/binary_sensor.py b/homeassistant/components/onewire/binary_sensor.py index ff2ee55d0bd..0b78988f7e1 100644 --- a/homeassistant/components/onewire/binary_sensor.py +++ b/homeassistant/components/onewire/binary_sensor.py @@ -20,7 +20,13 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback -from .const import CONF_TYPE_OWSERVER, DOMAIN, READ_MODE_BOOL +from .const import ( + CONF_TYPE_OWSERVER, + DEVICE_KEYS_0_7, + DEVICE_KEYS_A_B, + DOMAIN, + READ_MODE_BOOL, +) from .onewire_entities import OneWireEntityDescription, OneWireProxyEntity from .onewirehub import OneWireHub @@ -33,69 +39,23 @@ class OneWireBinarySensorEntityDescription( DEVICE_BINARY_SENSORS: dict[str, tuple[OneWireBinarySensorEntityDescription, ...]] = { - "12": ( + "12": tuple( OneWireBinarySensorEntityDescription( - key="sensed.A", + key=f"sensed.{id}", entity_registry_enabled_default=False, - name="Sensed A", + name=f"Sensed {id}", read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.B", - entity_registry_enabled_default=False, - name="Sensed B", - read_mode=READ_MODE_BOOL, - ), + ) + for id in DEVICE_KEYS_A_B ), - "29": ( + "29": tuple( OneWireBinarySensorEntityDescription( - key="sensed.0", + key=f"sensed.{id}", entity_registry_enabled_default=False, - name="Sensed 0", + name=f"Sensed {id}", read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.1", - entity_registry_enabled_default=False, - name="Sensed 1", - read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.2", - entity_registry_enabled_default=False, - name="Sensed 2", - read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.3", - entity_registry_enabled_default=False, - name="Sensed 3", - read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.4", - entity_registry_enabled_default=False, - name="Sensed 4", - read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.5", - entity_registry_enabled_default=False, - name="Sensed 5", - read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.6", - entity_registry_enabled_default=False, - name="Sensed 6", - read_mode=READ_MODE_BOOL, - ), - OneWireBinarySensorEntityDescription( - key="sensed.7", - entity_registry_enabled_default=False, - name="Sensed 7", - read_mode=READ_MODE_BOOL, - ), + ) + for id in DEVICE_KEYS_0_7 ), } diff --git a/homeassistant/components/onewire/const.py b/homeassistant/components/onewire/const.py index 4d758146aff..54bfc686459 100644 --- a/homeassistant/components/onewire/const.py +++ b/homeassistant/components/onewire/const.py @@ -17,6 +17,9 @@ DEFAULT_SYSBUS_MOUNT_DIR = "/sys/bus/w1/devices/" DOMAIN = "onewire" +DEVICE_KEYS_0_7 = range(8) +DEVICE_KEYS_A_B = ("A", "B") + PRESSURE_CBAR = "cbar" READ_MODE_BOOL = "bool" diff --git a/homeassistant/components/onewire/switch.py b/homeassistant/components/onewire/switch.py index 678f930901f..e8e790feab4 100644 --- a/homeassistant/components/onewire/switch.py +++ b/homeassistant/components/onewire/switch.py @@ -19,7 +19,13 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback -from .const import CONF_TYPE_OWSERVER, DOMAIN, READ_MODE_BOOL +from .const import ( + CONF_TYPE_OWSERVER, + DEVICE_KEYS_0_7, + DEVICE_KEYS_A_B, + DOMAIN, + READ_MODE_BOOL, +) from .onewire_entities import OneWireEntityDescription, OneWireProxyEntity from .onewirehub import OneWireHub @@ -38,129 +44,45 @@ DEVICE_SWITCHES: dict[str, tuple[OneWireEntityDescription, ...]] = { read_mode=READ_MODE_BOOL, ), ), - "12": ( - OneWireSwitchEntityDescription( - key="PIO.A", - entity_registry_enabled_default=False, - name="PIO A", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.B", - entity_registry_enabled_default=False, - name="PIO B", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.A", - entity_registry_enabled_default=False, - name="Latch A", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.B", - entity_registry_enabled_default=False, - name="Latch B", - read_mode=READ_MODE_BOOL, - ), + "12": tuple( + [ + OneWireSwitchEntityDescription( + key=f"PIO.{id}", + entity_registry_enabled_default=False, + name=f"PIO {id}", + read_mode=READ_MODE_BOOL, + ) + for id in DEVICE_KEYS_A_B + ] + + [ + OneWireSwitchEntityDescription( + key=f"latch.{id}", + entity_registry_enabled_default=False, + name=f"Latch {id}", + read_mode=READ_MODE_BOOL, + ) + for id in DEVICE_KEYS_A_B + ] ), - "29": ( - OneWireSwitchEntityDescription( - key="PIO.0", - entity_registry_enabled_default=False, - name="PIO 0", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.1", - entity_registry_enabled_default=False, - name="PIO 1", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.2", - entity_registry_enabled_default=False, - name="PIO 2", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.3", - entity_registry_enabled_default=False, - name="PIO 3", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.4", - entity_registry_enabled_default=False, - name="PIO 4", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.5", - entity_registry_enabled_default=False, - name="PIO 5", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.6", - entity_registry_enabled_default=False, - name="PIO 6", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="PIO.7", - entity_registry_enabled_default=False, - name="PIO 7", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.0", - entity_registry_enabled_default=False, - name="Latch 0", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.1", - entity_registry_enabled_default=False, - name="Latch 1", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.2", - entity_registry_enabled_default=False, - name="Latch 2", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.3", - entity_registry_enabled_default=False, - name="Latch 3", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.4", - entity_registry_enabled_default=False, - name="Latch 4", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.5", - entity_registry_enabled_default=False, - name="Latch 5", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.6", - entity_registry_enabled_default=False, - name="Latch 6", - read_mode=READ_MODE_BOOL, - ), - OneWireSwitchEntityDescription( - key="latch.7", - entity_registry_enabled_default=False, - name="Latch 7", - read_mode=READ_MODE_BOOL, - ), + "29": tuple( + [ + OneWireSwitchEntityDescription( + key=f"PIO.{id}", + entity_registry_enabled_default=False, + name=f"PIO {id}", + read_mode=READ_MODE_BOOL, + ) + for id in DEVICE_KEYS_0_7 + ] + + [ + OneWireSwitchEntityDescription( + key=f"latch.{id}", + entity_registry_enabled_default=False, + name=f"Latch {id}", + read_mode=READ_MODE_BOOL, + ) + for id in DEVICE_KEYS_0_7 + ] ), }