Improve lists in integrations [B] (#113069)

homeassistant/components/baf/sensor.py

@@ -100,10 +100,11 @@ async def async_setup_entry(
     """Set up BAF fan sensors."""
     data: BAFData = hass.data[DOMAIN][entry.entry_id]
     device = data.device
-    sensors_descriptions: list[BAFSensorDescription] = []
+    sensors_descriptions: list[BAFSensorDescription] = [
-    for description in DEFINED_ONLY_SENSORS:
+        description
-        if getattr(device, description.key):
+        for description in DEFINED_ONLY_SENSORS
-            sensors_descriptions.append(description)
+        if getattr(device, description.key)
+    ]
     if device.has_auto_comfort:
         sensors_descriptions.extend(AUTO_COMFORT_SENSORS)
     if device.has_fan:

homeassistant/components/bayesian/binary_sensor.py

@@ -313,9 +313,9 @@ class BayesianBinarySensor(BinarySensorEntity):
                 self.hass, observations, text=f"{self._attr_name}/{entity}"
             )
 
-        all_template_observations: list[Observation] = []
+        all_template_observations: list[Observation] = [
-        for observations in self.observations_by_template.values():
+            observations[0] for observations in self.observations_by_template.values()
-            all_template_observations.append(observations[0])
+        ]
         if len(all_template_observations) == 2:
             raise_mirrored_entries(
                 self.hass,

homeassistant/components/blue_current/sensor.py

@@ -217,13 +217,13 @@ async def async_setup_entry(
 ) -> None:
     """Set up Blue Current sensors."""
     connector: Connector = hass.data[DOMAIN][entry.entry_id]
-    sensor_list: list[SensorEntity] = []
+    sensor_list: list[SensorEntity] = [
-    for evse_id in connector.charge_points:
+        ChargePointSensor(connector, sensor, evse_id)
-        for sensor in SENSORS:
+        for evse_id in connector.charge_points
-            sensor_list.append(ChargePointSensor(connector, sensor, evse_id))
+        for sensor in SENSORS
+    ]
 
-    for grid_sensor in GRID_SENSORS:
+    sensor_list.extend(GridSensor(connector, sensor) for sensor in GRID_SENSORS)
-        sensor_list.append(GridSensor(connector, grid_sensor))
 
     async_add_entities(sensor_list)
 

homeassistant/components/bluesound/media_player.py

@@ -686,20 +686,15 @@ class BluesoundPlayer(MediaPlayerEntity):
         if self._status is None or (self.is_grouped and not self.is_master):
             return None
 
-        sources = []
+        sources = [source["title"] for source in self._preset_items]
 
-        for source in self._preset_items:
+        sources.extend(
-            sources.append(source["title"])
+            source["title"]
+            for source in self._services_items
+            if source["type"] in ("LocalMusic", "RadioService")
+        )
 
-        for source in [
+        sources.extend(source["title"] for source in self._capture_items)
-            x
-            for x in self._services_items
-            if x["type"] in ("LocalMusic", "RadioService")
-        ]:
-            sources.append(source["title"])
-
-        for source in self._capture_items:
-            sources.append(source["title"])
 
         return sources
 

homeassistant/components/bluetooth/match.py

@@ -249,39 +249,47 @@ class BluetoothMatcherIndexBase(Generic[_T]):
 
     def match(self, service_info: BluetoothServiceInfoBleak) -> list[_T]:
         """Check for a match."""
-        matches = []
+        matches: list[_T] = []
         if (name := service_info.name) and (
             local_name_matchers := self.local_name.get(
                 name[:LOCAL_NAME_MIN_MATCH_LENGTH]
             )
         ):
-            for matcher in local_name_matchers:
+            matches.extend(
-                if ble_device_matches(matcher, service_info):
+                matcher
-                    matches.append(matcher)
+                for matcher in local_name_matchers
+                if ble_device_matches(matcher, service_info)
+            )
 
         if self.service_data_uuid_set and service_info.service_data:
-            for service_data_uuid in self.service_data_uuid_set.intersection(
+            matches.extend(
-                service_info.service_data
+                matcher
-            ):
+                for service_data_uuid in self.service_data_uuid_set.intersection(
-                for matcher in self.service_data_uuid[service_data_uuid]:
+                    service_info.service_data
-                    if ble_device_matches(matcher, service_info):
+                )
-                        matches.append(matcher)
+                for matcher in self.service_data_uuid[service_data_uuid]
+                if ble_device_matches(matcher, service_info)
+            )
 
         if self.manufacturer_id_set and service_info.manufacturer_data:
-            for manufacturer_id in self.manufacturer_id_set.intersection(
+            matches.extend(
-                service_info.manufacturer_data
+                matcher
-            ):
+                for manufacturer_id in self.manufacturer_id_set.intersection(
-                for matcher in self.manufacturer_id[manufacturer_id]:
+                    service_info.manufacturer_data
-                    if ble_device_matches(matcher, service_info):
+                )
-                        matches.append(matcher)
+                for matcher in self.manufacturer_id[manufacturer_id]
+                if ble_device_matches(matcher, service_info)
+            )
 
         if self.service_uuid_set and service_info.service_uuids:
-            for service_uuid in self.service_uuid_set.intersection(
+            matches.extend(
-                service_info.service_uuids
+                matcher
-            ):
+                for service_uuid in self.service_uuid_set.intersection(
-                for matcher in self.service_uuid[service_uuid]:
+                    service_info.service_uuids
-                    if ble_device_matches(matcher, service_info):
+                )
-                        matches.append(matcher)
+                for matcher in self.service_uuid[service_uuid]
+                if ble_device_matches(matcher, service_info)
+            )
 
         return matches
 

homeassistant/components/bmw_connected_drive/lock.py

@@ -31,17 +31,10 @@ async def async_setup_entry(
     """Set up the MyBMW lock from config entry."""
     coordinator: BMWDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
 
-    entities: list[BMWLock] = []
+    if not coordinator.read_only:
-
+        async_add_entities(
-    for vehicle in coordinator.account.vehicles:
+            BMWLock(coordinator, vehicle) for vehicle in coordinator.account.vehicles
-        if not coordinator.read_only:
+        )
-            entities.append(
-                BMWLock(
-                    coordinator,
-                    vehicle,
-                )
-            )
-    async_add_entities(entities)
 
 
 class BMWLock(BMWBaseEntity, LockEntity):

homeassistant/components/bosch_shc/binary_sensor.py

@@ -23,39 +23,38 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the SHC binary sensor platform."""
-    entities: list[BinarySensorEntity] = []
     session: SHCSession = hass.data[DOMAIN][config_entry.entry_id][DATA_SESSION]
 
-    for binary_sensor in (
+    entities: list[BinarySensorEntity] = [
-        session.device_helper.shutter_contacts + session.device_helper.shutter_contacts2
+        ShutterContactSensor(
-    ):
+            device=binary_sensor,
-        entities.append(
+            parent_id=session.information.unique_id,
-            ShutterContactSensor(
+            entry_id=config_entry.entry_id,
-                device=binary_sensor,
-                parent_id=session.information.unique_id,
-                entry_id=config_entry.entry_id,
-            )
         )
+        for binary_sensor in (
+            session.device_helper.shutter_contacts
+            + session.device_helper.shutter_contacts2
+        )
+    ]
 
-    for binary_sensor in (
+    entities.extend(
-        session.device_helper.motion_detectors
+        BatterySensor(
-        + session.device_helper.shutter_contacts
+            device=binary_sensor,
-        + session.device_helper.shutter_contacts2
+            parent_id=session.information.unique_id,
-        + session.device_helper.smoke_detectors
+            entry_id=config_entry.entry_id,
-        + session.device_helper.thermostats
+        )
-        + session.device_helper.twinguards
+        for binary_sensor in (
-        + session.device_helper.universal_switches
+            session.device_helper.motion_detectors
-        + session.device_helper.wallthermostats
+            + session.device_helper.shutter_contacts
-        + session.device_helper.water_leakage_detectors
+            + session.device_helper.shutter_contacts2
-    ):
+            + session.device_helper.smoke_detectors
-        if binary_sensor.supports_batterylevel:
+            + session.device_helper.thermostats
-            entities.append(
+            + session.device_helper.twinguards
-                BatterySensor(
+            + session.device_helper.universal_switches
-                    device=binary_sensor,
+            + session.device_helper.wallthermostats
-                    parent_id=session.information.unique_id,
+            + session.device_helper.water_leakage_detectors
-                    entry_id=config_entry.entry_id,
+        )
-                )
+    )
-            )
 
     async_add_entities(entities)
 

homeassistant/components/bosch_shc/cover.py

@@ -25,19 +25,16 @@ async def async_setup_entry(
 ) -> None:
     """Set up the SHC cover platform."""
 
-    entities = []
     session: SHCSession = hass.data[DOMAIN][config_entry.entry_id][DATA_SESSION]
 
-    for cover in session.device_helper.shutter_controls:
+    async_add_entities(
-        entities.append(
+        ShutterControlCover(
-            ShutterControlCover(
+            device=cover,
-                device=cover,
+            parent_id=session.information.unique_id,
-                parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
-                entry_id=config_entry.entry_id,
-            )
         )
-
+        for cover in session.device_helper.shutter_controls
-    async_add_entities(entities)
+    )
 
 
 class ShutterControlCover(SHCEntity, CoverEntity):

homeassistant/components/bosch_shc/switch.py

@@ -84,65 +84,66 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the SHC switch platform."""
-    entities: list[SwitchEntity] = []
     session: SHCSession = hass.data[DOMAIN][config_entry.entry_id][DATA_SESSION]
 
-    for switch in session.device_helper.smart_plugs:
+    entities: list[SwitchEntity] = [
-        entities.append(
+        SHCSwitch(
-            SHCSwitch(
+            device=switch,
-                device=switch,
+            parent_id=session.information.unique_id,
-                parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
-                entry_id=config_entry.entry_id,
+            description=SWITCH_TYPES["smartplug"],
-                description=SWITCH_TYPES["smartplug"],
-            )
-        )
-        entities.append(
-            SHCRoutingSwitch(
-                device=switch,
-                parent_id=session.information.unique_id,
-                entry_id=config_entry.entry_id,
-            )
         )
+        for switch in session.device_helper.smart_plugs
+    ]
 
-    for switch in session.device_helper.light_switches_bsm:
+    entities.extend(
-        entities.append(
+        SHCRoutingSwitch(
-            SHCSwitch(
+            device=switch,
-                device=switch,
+            parent_id=session.information.unique_id,
-                parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
-                entry_id=config_entry.entry_id,
-                description=SWITCH_TYPES["lightswitch"],
-            )
         )
+        for switch in session.device_helper.smart_plugs
+    )
 
-    for switch in session.device_helper.smart_plugs_compact:
+    entities.extend(
-        entities.append(
+        SHCSwitch(
-            SHCSwitch(
+            device=switch,
-                device=switch,
+            parent_id=session.information.unique_id,
-                parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
-                entry_id=config_entry.entry_id,
+            description=SWITCH_TYPES["lightswitch"],
-                description=SWITCH_TYPES["smartplugcompact"],
-            )
         )
+        for switch in session.device_helper.light_switches_bsm
+    )
 
-    for switch in session.device_helper.camera_eyes:
+    entities.extend(
-        entities.append(
+        SHCSwitch(
-            SHCSwitch(
+            device=switch,
-                device=switch,
+            parent_id=session.information.unique_id,
-                parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
-                entry_id=config_entry.entry_id,
+            description=SWITCH_TYPES["smartplugcompact"],
-                description=SWITCH_TYPES["cameraeyes"],
-            )
         )
+        for switch in session.device_helper.smart_plugs_compact
+    )
 
-    for switch in session.device_helper.camera_360:
+    entities.extend(
-        entities.append(
+        SHCSwitch(
-            SHCSwitch(
+            device=switch,
-                device=switch,
+            parent_id=session.information.unique_id,
-                parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
-                entry_id=config_entry.entry_id,
+            description=SWITCH_TYPES["cameraeyes"],
-                description=SWITCH_TYPES["camera360"],
-            )
         )
+        for switch in session.device_helper.camera_eyes
+    )
+
+    entities.extend(
+        SHCSwitch(
+            device=switch,
+            parent_id=session.information.unique_id,
+            entry_id=config_entry.entry_id,
+            description=SWITCH_TYPES["camera360"],
+        )
+        for switch in session.device_helper.camera_360
+    )
 
     async_add_entities(entities)
 

homeassistant/components/brother/sensor.py

@@ -339,12 +339,11 @@ async def async_setup_entry(
         )
         entity_registry.async_update_entity(entity_id, new_unique_id=new_unique_id)
 
-    sensors = []
+    async_add_entities(
-
+        BrotherPrinterSensor(coordinator, description)
-    for description in SENSOR_TYPES:
+        for description in SENSOR_TYPES
-        if description.value(coordinator.data) is not None:
+        if description.value(coordinator.data) is not None
-            sensors.append(BrotherPrinterSensor(coordinator, description))
+    )
-    async_add_entities(sensors, False)
 
 
 class BrotherPrinterSensor(