From a8f1cc0d330372f60e50954b7cf049fcf9a18762 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 17 Oct 2022 21:11:58 +0200 Subject: [PATCH] Remove unneeded guards from (async_)add_entities call (#80471) --- homeassistant/components/aemet/weather.py | 3 +-- homeassistant/components/asuswrt/device_tracker.py | 3 +-- homeassistant/components/bond/button.py | 3 +-- homeassistant/components/bosch_shc/binary_sensor.py | 3 +-- homeassistant/components/bosch_shc/cover.py | 3 +-- homeassistant/components/bosch_shc/sensor.py | 3 +-- homeassistant/components/bosch_shc/switch.py | 3 +-- homeassistant/components/daikin/switch.py | 3 +-- .../components/devolo_home_network/device_tracker.py | 6 ++---- homeassistant/components/dominos/__init__.py | 3 +-- homeassistant/components/dynalite/dynalitebase.py | 3 +-- homeassistant/components/enocean/sensor.py | 3 +-- homeassistant/components/firmata/binary_sensor.py | 3 +-- homeassistant/components/firmata/light.py | 3 +-- homeassistant/components/firmata/sensor.py | 3 +-- homeassistant/components/firmata/switch.py | 3 +-- homeassistant/components/flume/binary_sensor.py | 3 +-- homeassistant/components/flume/sensor.py | 3 +-- homeassistant/components/flux_led/number.py | 3 +-- homeassistant/components/flux_led/select.py | 3 +-- homeassistant/components/flux_led/switch.py | 3 +-- homeassistant/components/freebox/device_tracker.py | 3 +-- homeassistant/components/fritz/device_tracker.py | 3 +-- homeassistant/components/fronius/coordinator.py | 3 +-- .../components/homematicip_cloud/binary_sensor.py | 3 +-- .../components/homematicip_cloud/climate.py | 3 +-- homeassistant/components/homematicip_cloud/cover.py | 3 +-- homeassistant/components/homematicip_cloud/light.py | 3 +-- homeassistant/components/homematicip_cloud/sensor.py | 3 +-- homeassistant/components/homematicip_cloud/switch.py | 3 +-- .../components/homematicip_cloud/weather.py | 3 +-- homeassistant/components/icloud/device_tracker.py | 3 +-- homeassistant/components/icloud/sensor.py | 3 +-- homeassistant/components/insteon/utils.py | 3 +-- homeassistant/components/iotawatt/sensor.py | 3 +-- .../components/keenetic_ndms2/device_tracker.py | 6 ++---- homeassistant/components/life360/device_tracker.py | 3 +-- homeassistant/components/lutron_caseta/button.py | 3 +-- homeassistant/components/maxcube/binary_sensor.py | 3 +-- homeassistant/components/maxcube/climate.py | 3 +-- homeassistant/components/mikrotik/device_tracker.py | 3 +-- .../components/nederlandse_spoorwegen/sensor.py | 3 +-- homeassistant/components/netatmo/sensor.py | 3 +-- homeassistant/components/netgear/device_tracker.py | 3 +-- homeassistant/components/netgear/sensor.py | 3 +-- homeassistant/components/netgear/switch.py | 3 +-- homeassistant/components/octoprint/sensor.py | 3 +-- homeassistant/components/owntracks/device_tracker.py | 3 +-- homeassistant/components/plum_lightpad/light.py | 3 +-- .../components/ruckus_unleashed/device_tracker.py | 6 ++---- homeassistant/components/tado/binary_sensor.py | 3 +-- homeassistant/components/tado/climate.py | 3 +-- homeassistant/components/tado/sensor.py | 3 +-- homeassistant/components/tado/water_heater.py | 3 +-- homeassistant/components/unifi/device_tracker.py | 6 ++---- homeassistant/components/unifi/sensor.py | 6 ++---- homeassistant/components/unifi/switch.py | 12 ++++-------- homeassistant/components/unifi/update.py | 3 +-- homeassistant/components/wemo/light.py | 3 +-- homeassistant/components/wled/light.py | 3 +-- homeassistant/components/wled/number.py | 3 +-- homeassistant/components/wled/select.py | 3 +-- homeassistant/components/wled/switch.py | 3 +-- homeassistant/components/xbox/binary_sensor.py | 3 +-- homeassistant/components/xbox/sensor.py | 3 +-- homeassistant/components/xbox_live/sensor.py | 3 +-- 66 files changed, 74 insertions(+), 148 deletions(-) diff --git a/homeassistant/components/aemet/weather.py b/homeassistant/components/aemet/weather.py index a7ff3630e78..695ae283a47 100644 --- a/homeassistant/components/aemet/weather.py +++ b/homeassistant/components/aemet/weather.py @@ -84,8 +84,7 @@ async def async_setup_entry( unique_id = f"{config_entry.unique_id} {mode}" entities.append(AemetWeather(name, unique_id, weather_coordinator, mode)) - if entities: - async_add_entities(entities, False) + async_add_entities(entities, False) class AemetWeather(CoordinatorEntity[WeatherUpdateCoordinator], WeatherEntity): diff --git a/homeassistant/components/asuswrt/device_tracker.py b/homeassistant/components/asuswrt/device_tracker.py index fc2d4ede26d..efdf4993927 100644 --- a/homeassistant/components/asuswrt/device_tracker.py +++ b/homeassistant/components/asuswrt/device_tracker.py @@ -47,8 +47,7 @@ def add_entities( new_tracked.append(AsusWrtDevice(router, device)) tracked.add(mac) - if new_tracked: - async_add_entities(new_tracked) + async_add_entities(new_tracked) class AsusWrtDevice(ScannerEntity): diff --git a/homeassistant/components/bond/button.py b/homeassistant/components/bond/button.py index 6f57a23b079..32b76c6fcae 100644 --- a/homeassistant/components/bond/button.py +++ b/homeassistant/components/bond/button.py @@ -274,8 +274,7 @@ async def async_setup_entry( ) entities.extend(device_entities) - if entities: - async_add_entities(entities) + async_add_entities(entities) class BondButtonEntity(BondEntity, ButtonEntity): diff --git a/homeassistant/components/bosch_shc/binary_sensor.py b/homeassistant/components/bosch_shc/binary_sensor.py index e76e562f9ef..25ab320a4c4 100644 --- a/homeassistant/components/bosch_shc/binary_sensor.py +++ b/homeassistant/components/bosch_shc/binary_sensor.py @@ -53,8 +53,7 @@ async def async_setup_entry( ) ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class ShutterContactSensor(SHCEntity, BinarySensorEntity): diff --git a/homeassistant/components/bosch_shc/cover.py b/homeassistant/components/bosch_shc/cover.py index 91dc361a23d..3f1a9eccb93 100644 --- a/homeassistant/components/bosch_shc/cover.py +++ b/homeassistant/components/bosch_shc/cover.py @@ -36,8 +36,7 @@ async def async_setup_entry( ) ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class ShutterControlCover(SHCEntity, CoverEntity): diff --git a/homeassistant/components/bosch_shc/sensor.py b/homeassistant/components/bosch_shc/sensor.py index cb8272e92cf..90fc44710a0 100644 --- a/homeassistant/components/bosch_shc/sensor.py +++ b/homeassistant/components/bosch_shc/sensor.py @@ -157,8 +157,7 @@ async def async_setup_entry( ) ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class TemperatureSensor(SHCEntity, SensorEntity): diff --git a/homeassistant/components/bosch_shc/switch.py b/homeassistant/components/bosch_shc/switch.py index 28b68ac091b..1bc430c8d4a 100644 --- a/homeassistant/components/bosch_shc/switch.py +++ b/homeassistant/components/bosch_shc/switch.py @@ -156,8 +156,7 @@ async def async_setup_entry( ) ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class SHCSwitch(SHCEntity, SwitchEntity): diff --git a/homeassistant/components/daikin/switch.py b/homeassistant/components/daikin/switch.py index 0f885e63bf7..23b4b526f9a 100644 --- a/homeassistant/components/daikin/switch.py +++ b/homeassistant/components/daikin/switch.py @@ -50,8 +50,7 @@ async def async_setup_entry( # device supports the streamer, so assume so if it does support # advanced modes. switches.append(DaikinStreamerSwitch(daikin_api)) - if switches: - async_add_entities(switches) + async_add_entities(switches) class DaikinZoneSwitch(SwitchEntity): diff --git a/homeassistant/components/devolo_home_network/device_tracker.py b/homeassistant/components/devolo_home_network/device_tracker.py index 0e3e47d9320..f535136680a 100644 --- a/homeassistant/components/devolo_home_network/device_tracker.py +++ b/homeassistant/components/devolo_home_network/device_tracker.py @@ -55,8 +55,7 @@ async def async_setup_entry( ) ) tracked.add(station[MAC_ADDRESS]) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) @callback def restore_entities() -> None: @@ -82,8 +81,7 @@ async def async_setup_entry( ) tracked.add(mac_address) - if missing: - async_add_entities(missing) + async_add_entities(missing) if device.device and "wifi1" in device.device.features: restore_entities() diff --git a/homeassistant/components/dominos/__init__.py b/homeassistant/components/dominos/__init__.py index ecfe7b65a7d..37344ed9d4b 100644 --- a/homeassistant/components/dominos/__init__.py +++ b/homeassistant/components/dominos/__init__.py @@ -90,8 +90,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool: order = DominosOrder(order_info, dominos) entities.append(order) - if entities: - component.add_entities(entities) + component.add_entities(entities) # Return boolean to indicate that initialization was successfully. return True diff --git a/homeassistant/components/dynalite/dynalitebase.py b/homeassistant/components/dynalite/dynalitebase.py index c1814307d1c..b4b8285cbb0 100644 --- a/homeassistant/components/dynalite/dynalitebase.py +++ b/homeassistant/components/dynalite/dynalitebase.py @@ -31,8 +31,7 @@ def async_setup_entry_base( added_entities = [] for device in devices: added_entities.append(entity_from_device(device, bridge)) - if added_entities: - async_add_entities(added_entities) + async_add_entities(added_entities) bridge.register_add_devices(platform, async_add_entities_platform) diff --git a/homeassistant/components/enocean/sensor.py b/homeassistant/components/enocean/sensor.py index 84237852e80..ae75dfe25c1 100644 --- a/homeassistant/components/enocean/sensor.py +++ b/homeassistant/components/enocean/sensor.py @@ -148,8 +148,7 @@ def setup_platform( elif sensor_type == SENSOR_TYPE_WINDOWHANDLE: entities = [EnOceanWindowHandle(dev_id, dev_name, SENSOR_DESC_WINDOWHANDLE)] - if entities: - add_entities(entities) + add_entities(entities) class EnOceanSensor(EnOceanEntity, RestoreEntity, SensorEntity): diff --git a/homeassistant/components/firmata/binary_sensor.py b/homeassistant/components/firmata/binary_sensor.py index 97b6581c420..0cb38d1df8b 100644 --- a/homeassistant/components/firmata/binary_sensor.py +++ b/homeassistant/components/firmata/binary_sensor.py @@ -40,8 +40,7 @@ async def async_setup_entry( binary_sensor_entity = FirmataBinarySensor(api, config_entry, name, pin) new_entities.append(binary_sensor_entity) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) class FirmataBinarySensor(FirmataPinEntity, BinarySensorEntity): diff --git a/homeassistant/components/firmata/light.py b/homeassistant/components/firmata/light.py index 59be2484d66..29504f704bf 100644 --- a/homeassistant/components/firmata/light.py +++ b/homeassistant/components/firmata/light.py @@ -46,8 +46,7 @@ async def async_setup_entry( light_entity = FirmataLight(api, config_entry, name, pin) new_entities.append(light_entity) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) class FirmataLight(FirmataPinEntity, LightEntity): diff --git a/homeassistant/components/firmata/sensor.py b/homeassistant/components/firmata/sensor.py index 359090fae1c..3497aec9e88 100644 --- a/homeassistant/components/firmata/sensor.py +++ b/homeassistant/components/firmata/sensor.py @@ -40,8 +40,7 @@ async def async_setup_entry( sensor_entity = FirmataSensor(api, config_entry, name, pin) new_entities.append(sensor_entity) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) class FirmataSensor(FirmataPinEntity, SensorEntity): diff --git a/homeassistant/components/firmata/switch.py b/homeassistant/components/firmata/switch.py index 10037bb6a7a..f52300b6db3 100644 --- a/homeassistant/components/firmata/switch.py +++ b/homeassistant/components/firmata/switch.py @@ -42,8 +42,7 @@ async def async_setup_entry( switch_entity = FirmataSwitch(api, config_entry, name, pin) new_entities.append(switch_entity) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) class FirmataSwitch(FirmataPinEntity, SwitchEntity): diff --git a/homeassistant/components/flume/binary_sensor.py b/homeassistant/components/flume/binary_sensor.py index f6b1f63a26c..2f5ea4323d9 100644 --- a/homeassistant/components/flume/binary_sensor.py +++ b/homeassistant/components/flume/binary_sensor.py @@ -122,8 +122,7 @@ async def async_setup_entry( ] ) - if flume_entity_list: - async_add_entities(flume_entity_list) + async_add_entities(flume_entity_list) class FlumeNotificationBinarySensor(FlumeEntity, BinarySensorEntity): diff --git a/homeassistant/components/flume/sensor.py b/homeassistant/components/flume/sensor.py index 09f65f7d891..703744c248e 100644 --- a/homeassistant/components/flume/sensor.py +++ b/homeassistant/components/flume/sensor.py @@ -120,8 +120,7 @@ async def async_setup_entry( ] ) - if flume_entity_list: - async_add_entities(flume_entity_list) + async_add_entities(flume_entity_list) class FlumeSensor(FlumeEntity, SensorEntity): diff --git a/homeassistant/components/flux_led/number.py b/homeassistant/components/flux_led/number.py index 18237c97e94..4fe0e250db6 100644 --- a/homeassistant/components/flux_led/number.py +++ b/homeassistant/components/flux_led/number.py @@ -89,8 +89,7 @@ async def async_setup_entry( FluxSpeedNumber(coordinator, base_unique_id, f"{name} Effect Speed", None) ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class FluxSpeedNumber( diff --git a/homeassistant/components/flux_led/select.py b/homeassistant/components/flux_led/select.py index 63929740020..9e24cd2cd7d 100644 --- a/homeassistant/components/flux_led/select.py +++ b/homeassistant/components/flux_led/select.py @@ -81,8 +81,7 @@ async def async_setup_entry( if FLUX_COLOR_MODE_RGBW in device.color_modes: entities.append(FluxWhiteChannelSelect(coordinator.device, entry)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class FluxConfigAtStartSelect(FluxBaseEntity, SelectEntity): diff --git a/homeassistant/components/flux_led/switch.py b/homeassistant/components/flux_led/switch.py index 18b079beff9..168d16268aa 100644 --- a/homeassistant/components/flux_led/switch.py +++ b/homeassistant/components/flux_led/switch.py @@ -48,8 +48,7 @@ async def async_setup_entry( FluxMusicSwitch(coordinator, base_unique_id, f"{name} Music", "music") ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class FluxSwitch( diff --git a/homeassistant/components/freebox/device_tracker.py b/homeassistant/components/freebox/device_tracker.py index bd71588aea0..0b48d08170a 100644 --- a/homeassistant/components/freebox/device_tracker.py +++ b/homeassistant/components/freebox/device_tracker.py @@ -48,8 +48,7 @@ def add_entities( new_tracked.append(FreeboxDevice(router, device)) tracked.add(mac) - if new_tracked: - async_add_entities(new_tracked, True) + async_add_entities(new_tracked, True) class FreeboxDevice(ScannerEntity): diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py index 9591fec156b..998eab2ede7 100644 --- a/homeassistant/components/fritz/device_tracker.py +++ b/homeassistant/components/fritz/device_tracker.py @@ -65,8 +65,7 @@ def _async_add_entities( new_tracked.append(FritzBoxTracker(avm_wrapper, device)) data_fritz.tracked[avm_wrapper.unique_id].add(mac) - if new_tracked: - async_add_entities(new_tracked) + async_add_entities(new_tracked) class FritzBoxTracker(FritzDeviceBase, ScannerEntity): diff --git a/homeassistant/components/fronius/coordinator.py b/homeassistant/components/fronius/coordinator.py index c1090dab1b1..08779b9b673 100644 --- a/homeassistant/components/fronius/coordinator.py +++ b/homeassistant/components/fronius/coordinator.py @@ -104,8 +104,7 @@ class FroniusCoordinatorBase( continue new_entities.append(entity_constructor(self, key, solar_net_id)) self.unregistered_keys[solar_net_id].remove(key) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) _add_entities_for_unregistered_keys() self.solar_net.cleanup_callbacks.append( diff --git a/homeassistant/components/homematicip_cloud/binary_sensor.py b/homeassistant/components/homematicip_cloud/binary_sensor.py index 6d0fe0c1b96..db35a5d3ee5 100644 --- a/homeassistant/components/homematicip_cloud/binary_sensor.py +++ b/homeassistant/components/homematicip_cloud/binary_sensor.py @@ -142,8 +142,7 @@ async def async_setup_entry( elif isinstance(group, AsyncSecurityZoneGroup): entities.append(HomematicipSecurityZoneSensorGroup(hap, device=group)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipCloudConnectionSensor(HomematicipGenericEntity, BinarySensorEntity): diff --git a/homeassistant/components/homematicip_cloud/climate.py b/homeassistant/components/homematicip_cloud/climate.py index b3d2236f05a..2fc9f8fd12d 100644 --- a/homeassistant/components/homematicip_cloud/climate.py +++ b/homeassistant/components/homematicip_cloud/climate.py @@ -51,8 +51,7 @@ async def async_setup_entry( if isinstance(device, AsyncHeatingGroup): entities.append(HomematicipHeatingGroup(hap, device)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipHeatingGroup(HomematicipGenericEntity, ClimateEntity): diff --git a/homeassistant/components/homematicip_cloud/cover.py b/homeassistant/components/homematicip_cloud/cover.py index 31faea875a4..7038c423df0 100644 --- a/homeassistant/components/homematicip_cloud/cover.py +++ b/homeassistant/components/homematicip_cloud/cover.py @@ -62,8 +62,7 @@ async def async_setup_entry( if isinstance(group, AsyncExtendedLinkedShutterGroup): entities.append(HomematicipCoverShutterGroup(hap, group)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipBlindModule(HomematicipGenericEntity, CoverEntity): diff --git a/homeassistant/components/homematicip_cloud/light.py b/homeassistant/components/homematicip_cloud/light.py index c43ac510023..09a5cd7ec34 100644 --- a/homeassistant/components/homematicip_cloud/light.py +++ b/homeassistant/components/homematicip_cloud/light.py @@ -62,8 +62,7 @@ async def async_setup_entry( ): entities.append(HomematicipDimmer(hap, device)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipLight(HomematicipGenericEntity, LightEntity): diff --git a/homeassistant/components/homematicip_cloud/sensor.py b/homeassistant/components/homematicip_cloud/sensor.py index bb9dd8021ed..03aaa7626b7 100644 --- a/homeassistant/components/homematicip_cloud/sensor.py +++ b/homeassistant/components/homematicip_cloud/sensor.py @@ -130,8 +130,7 @@ async def async_setup_entry( entities.append(HomematicpTemperatureExternalSensorCh2(hap, device)) entities.append(HomematicpTemperatureExternalSensorDelta(hap, device)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipAccesspointDutyCycle(HomematicipGenericEntity, SensorEntity): diff --git a/homeassistant/components/homematicip_cloud/switch.py b/homeassistant/components/homematicip_cloud/switch.py index 1b39633bc15..770687ef50d 100644 --- a/homeassistant/components/homematicip_cloud/switch.py +++ b/homeassistant/components/homematicip_cloud/switch.py @@ -82,8 +82,7 @@ async def async_setup_entry( if isinstance(group, (AsyncExtendedLinkedSwitchingGroup, AsyncSwitchingGroup)): entities.append(HomematicipGroupSwitch(hap, group)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipMultiSwitch(HomematicipGenericEntity, SwitchEntity): diff --git a/homeassistant/components/homematicip_cloud/weather.py b/homeassistant/components/homematicip_cloud/weather.py index 3acbae95441..a52e99bfa4e 100644 --- a/homeassistant/components/homematicip_cloud/weather.py +++ b/homeassistant/components/homematicip_cloud/weather.py @@ -64,8 +64,7 @@ async def async_setup_entry( entities.append(HomematicipHomeWeather(hap)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class HomematicipWeatherSensor(HomematicipGenericEntity, WeatherEntity): diff --git a/homeassistant/components/icloud/device_tracker.py b/homeassistant/components/icloud/device_tracker.py index 44297a21112..fc1de213a69 100644 --- a/homeassistant/components/icloud/device_tracker.py +++ b/homeassistant/components/icloud/device_tracker.py @@ -51,8 +51,7 @@ def add_entities(account: IcloudAccount, async_add_entities, tracked): new_tracked.append(IcloudTrackerEntity(account, device)) tracked.add(dev_id) - if new_tracked: - async_add_entities(new_tracked, True) + async_add_entities(new_tracked, True) class IcloudTrackerEntity(TrackerEntity): diff --git a/homeassistant/components/icloud/sensor.py b/homeassistant/components/icloud/sensor.py index c3b23057ebc..e7c982607cb 100644 --- a/homeassistant/components/icloud/sensor.py +++ b/homeassistant/components/icloud/sensor.py @@ -47,8 +47,7 @@ def add_entities(account, async_add_entities, tracked): new_tracked.append(IcloudDeviceBatterySensor(account, device)) tracked.add(dev_id) - if new_tracked: - async_add_entities(new_tracked, True) + async_add_entities(new_tracked, True) class IcloudDeviceBatterySensor(SensorEntity): diff --git a/homeassistant/components/insteon/utils.py b/homeassistant/components/insteon/utils.py index 09375e7827a..c5dbba9c25b 100644 --- a/homeassistant/components/insteon/utils.py +++ b/homeassistant/components/insteon/utils.py @@ -392,5 +392,4 @@ def async_add_insteon_entities( groups = get_platform_groups(device, platform) for group in groups: new_entities.append(entity_type(device, group)) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) diff --git a/homeassistant/components/iotawatt/sensor.py b/homeassistant/components/iotawatt/sensor.py index 8bcf5bfae9a..dd04a32cce4 100644 --- a/homeassistant/components/iotawatt/sensor.py +++ b/homeassistant/components/iotawatt/sensor.py @@ -154,8 +154,7 @@ async def async_setup_entry( for key in coordinator.data["sensors"] if key not in created ] - if entities: - async_add_entities(entities) + async_add_entities(entities) coordinator.async_add_listener(new_data_received) diff --git a/homeassistant/components/keenetic_ndms2/device_tracker.py b/homeassistant/components/keenetic_ndms2/device_tracker.py index a2b01040a5a..4491b644b27 100644 --- a/homeassistant/components/keenetic_ndms2/device_tracker.py +++ b/homeassistant/components/keenetic_ndms2/device_tracker.py @@ -64,8 +64,7 @@ async def async_setup_entry( ) ) - if restored: - async_add_entities(restored) + async_add_entities(restored) async_dispatcher_connect(hass, router.signal_update, update_from_router) @@ -79,8 +78,7 @@ def update_items(router: KeeneticRouter, async_add_entities, tracked: set[str]): tracked.add(mac) new_tracked.append(KeeneticTracker(device, router)) - if new_tracked: - async_add_entities(new_tracked) + async_add_entities(new_tracked) class KeeneticTracker(ScannerEntity): diff --git a/homeassistant/components/life360/device_tracker.py b/homeassistant/components/life360/device_tracker.py index 2c05b944a27..a6ca0a16aa3 100644 --- a/homeassistant/components/life360/device_tracker.py +++ b/homeassistant/components/life360/device_tracker.py @@ -87,8 +87,7 @@ async def async_setup_entry( and not new_members_only ): new_entities.append(Life360DeviceTracker(coordinator, member_id)) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) process_data(new_members_only=False) entry.async_on_unload(coordinator.async_add_listener(process_data)) diff --git a/homeassistant/components/lutron_caseta/button.py b/homeassistant/components/lutron_caseta/button.py index 713c711f675..b8cbb23774a 100644 --- a/homeassistant/components/lutron_caseta/button.py +++ b/homeassistant/components/lutron_caseta/button.py @@ -67,8 +67,7 @@ async def async_setup_entry( ), ) - if entities: - async_add_entities(entities) + async_add_entities(entities) class LutronCasetaButton(LutronCasetaDevice, ButtonEntity): diff --git a/homeassistant/components/maxcube/binary_sensor.py b/homeassistant/components/maxcube/binary_sensor.py index c6c9ba8ebb0..051ef02ed25 100644 --- a/homeassistant/components/maxcube/binary_sensor.py +++ b/homeassistant/components/maxcube/binary_sensor.py @@ -28,8 +28,7 @@ def setup_platform( if device.is_windowshutter(): devices.append(MaxCubeShutter(handler, device)) - if devices: - add_entities(devices) + add_entities(devices) class MaxCubeBinarySensorBase(BinarySensorEntity): diff --git a/homeassistant/components/maxcube/climate.py b/homeassistant/components/maxcube/climate.py index 6361600518b..733736606f6 100644 --- a/homeassistant/components/maxcube/climate.py +++ b/homeassistant/components/maxcube/climate.py @@ -60,8 +60,7 @@ def setup_platform( if device.is_thermostat() or device.is_wallthermostat(): devices.append(MaxCubeClimate(handler, device)) - if devices: - add_entities(devices) + add_entities(devices) class MaxCubeClimate(ClimateEntity): diff --git a/homeassistant/components/mikrotik/device_tracker.py b/homeassistant/components/mikrotik/device_tracker.py index 9529322affd..cfa2e216d1d 100644 --- a/homeassistant/components/mikrotik/device_tracker.py +++ b/homeassistant/components/mikrotik/device_tracker.py @@ -68,8 +68,7 @@ def update_items( tracked[mac] = MikrotikDataUpdateCoordinatorTracker(device, coordinator) new_tracked.append(tracked[mac]) - if new_tracked: - async_add_entities(new_tracked) + async_add_entities(new_tracked) class MikrotikDataUpdateCoordinatorTracker( diff --git a/homeassistant/components/nederlandse_spoorwegen/sensor.py b/homeassistant/components/nederlandse_spoorwegen/sensor.py index 063fd12f5e0..913ea3800f0 100644 --- a/homeassistant/components/nederlandse_spoorwegen/sensor.py +++ b/homeassistant/components/nederlandse_spoorwegen/sensor.py @@ -88,8 +88,7 @@ def setup_platform( departure.get(CONF_TIME), ) ) - if sensors: - add_entities(sensors, True) + add_entities(sensors, True) def valid_stations(stations, given_stations): diff --git a/homeassistant/components/netatmo/sensor.py b/homeassistant/components/netatmo/sensor.py index 65ac610ef5d..82f6c95b699 100644 --- a/homeassistant/components/netatmo/sensor.py +++ b/homeassistant/components/netatmo/sensor.py @@ -399,8 +399,7 @@ async def async_setup_entry( for device_id in entities.values(): device_registry.async_remove_device(device_id) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) async_dispatcher_connect( hass, f"signal-{DOMAIN}-public-update-{entry.entry_id}", add_public_entities diff --git a/homeassistant/components/netgear/device_tracker.py b/homeassistant/components/netgear/device_tracker.py index cd648990e05..5feff521efa 100644 --- a/homeassistant/components/netgear/device_tracker.py +++ b/homeassistant/components/netgear/device_tracker.py @@ -39,8 +39,7 @@ async def async_setup_entry( new_entities.append(NetgearScannerEntity(coordinator, router, device)) tracked.add(mac) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) entry.async_on_unload(coordinator.async_add_listener(new_device_callback)) diff --git a/homeassistant/components/netgear/sensor.py b/homeassistant/components/netgear/sensor.py index c38142a3dc5..dc857e1377a 100644 --- a/homeassistant/components/netgear/sensor.py +++ b/homeassistant/components/netgear/sensor.py @@ -338,8 +338,7 @@ async def async_setup_entry( ) tracked.add(mac) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) entry.async_on_unload(coordinator.async_add_listener(new_device_callback)) diff --git a/homeassistant/components/netgear/switch.py b/homeassistant/components/netgear/switch.py index 6491ecf0abe..4318ae7598d 100644 --- a/homeassistant/components/netgear/switch.py +++ b/homeassistant/components/netgear/switch.py @@ -143,8 +143,7 @@ async def async_setup_entry( ) tracked.add(mac) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) entry.async_on_unload(coordinator.async_add_listener(new_device_callback)) diff --git a/homeassistant/components/octoprint/sensor.py b/homeassistant/components/octoprint/sensor.py index ad493022dfc..fd140d5c00e 100644 --- a/homeassistant/components/octoprint/sensor.py +++ b/homeassistant/components/octoprint/sensor.py @@ -71,8 +71,7 @@ async def async_setup_entry( device_id, ) ) - if new_tools: - async_add_entities(new_tools) + async_add_entities(new_tools) config_entry.async_on_unload(coordinator.async_add_listener(async_add_tool_sensors)) diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py index 79efee6bd2c..b65ac9ccbe7 100644 --- a/homeassistant/components/owntracks/device_tracker.py +++ b/homeassistant/components/owntracks/device_tracker.py @@ -49,8 +49,7 @@ async def async_setup_entry( hass.data[OT_DOMAIN]["context"].set_async_see(_receive_data) - if entities: - async_add_entities(entities) + async_add_entities(entities) class OwnTracksEntity(TrackerEntity, RestoreEntity): diff --git a/homeassistant/components/plum_lightpad/light.py b/homeassistant/components/plum_lightpad/light.py index f990efc3fcc..770570a3c39 100644 --- a/homeassistant/components/plum_lightpad/light.py +++ b/homeassistant/components/plum_lightpad/light.py @@ -42,8 +42,7 @@ async def async_setup_entry( logical_load = plum.get_load(device["llid"]) entities.append(PlumLight(load=logical_load)) - if entities: - async_add_entities(entities) + async_add_entities(entities) async def new_load(device): setup_entities(device) diff --git a/homeassistant/components/ruckus_unleashed/device_tracker.py b/homeassistant/components/ruckus_unleashed/device_tracker.py index 8c3e78ae479..c9d9df6068e 100644 --- a/homeassistant/components/ruckus_unleashed/device_tracker.py +++ b/homeassistant/components/ruckus_unleashed/device_tracker.py @@ -55,8 +55,7 @@ def add_new_entities(coordinator, async_add_entities, tracked): new_tracked.append(RuckusUnleashedDevice(coordinator, mac, device[API_NAME])) tracked.add(mac) - if new_tracked: - async_add_entities(new_tracked) + async_add_entities(new_tracked) @callback @@ -77,8 +76,7 @@ def restore_entities(registry, coordinator, entry, async_add_entities, tracked): ) tracked.add(entity.unique_id) - if missing: - async_add_entities(missing) + async_add_entities(missing) class RuckusUnleashedDevice(CoordinatorEntity, ScannerEntity): diff --git a/homeassistant/components/tado/binary_sensor.py b/homeassistant/components/tado/binary_sensor.py index 0eff510051d..7f009c278fe 100644 --- a/homeassistant/components/tado/binary_sensor.py +++ b/homeassistant/components/tado/binary_sensor.py @@ -90,8 +90,7 @@ async def async_setup_entry( ] ) - if entities: - async_add_entities(entities, True) + async_add_entities(entities, True) class TadoDeviceBinarySensor(TadoDeviceEntity, BinarySensorEntity): diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py index 16a433b1d12..5f58203e9e8 100644 --- a/homeassistant/components/tado/climate.py +++ b/homeassistant/components/tado/climate.py @@ -104,8 +104,7 @@ async def async_setup_entry( "set_temp_offset", ) - if entities: - async_add_entities(entities, True) + async_add_entities(entities, True) def _generate_entities(tado): diff --git a/homeassistant/components/tado/sensor.py b/homeassistant/components/tado/sensor.py index 22f4608f670..6d11e15a9fd 100644 --- a/homeassistant/components/tado/sensor.py +++ b/homeassistant/components/tado/sensor.py @@ -82,8 +82,7 @@ async def async_setup_entry( ] ) - if entities: - async_add_entities(entities, True) + async_add_entities(entities, True) class TadoHomeSensor(TadoHomeEntity, SensorEntity): diff --git a/homeassistant/components/tado/water_heater.py b/homeassistant/components/tado/water_heater.py index 3bd3ae48026..92551df8109 100644 --- a/homeassistant/components/tado/water_heater.py +++ b/homeassistant/components/tado/water_heater.py @@ -75,8 +75,7 @@ async def async_setup_entry( "set_timer", ) - if entities: - async_add_entities(entities, True) + async_add_entities(entities, True) def _generate_entities(tado): diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py index 2ae7f2c394f..f184663291d 100644 --- a/homeassistant/components/unifi/device_tracker.py +++ b/homeassistant/components/unifi/device_tracker.py @@ -111,8 +111,7 @@ def add_client_entities(controller, async_add_entities, clients): trackers.append(UniFiClientTracker(client, controller)) - if trackers: - async_add_entities(trackers) + async_add_entities(trackers) @callback @@ -127,8 +126,7 @@ def add_device_entities(controller, async_add_entities, devices): device = controller.api.devices[mac] trackers.append(UniFiDeviceTracker(device, controller)) - if trackers: - async_add_entities(trackers) + async_add_entities(trackers) class UniFiClientTracker(UniFiClientBase, ScannerEntity): diff --git a/homeassistant/components/unifi/sensor.py b/homeassistant/components/unifi/sensor.py index 165507c0498..ab750f6b33e 100644 --- a/homeassistant/components/unifi/sensor.py +++ b/homeassistant/components/unifi/sensor.py @@ -67,8 +67,7 @@ def add_bandwidth_entities(controller, async_add_entities, clients): client = controller.api.clients[mac] sensors.append(sensor_class(client, controller)) - if sensors: - async_add_entities(sensors) + async_add_entities(sensors) @callback @@ -83,8 +82,7 @@ def add_uptime_entities(controller, async_add_entities, clients): client = controller.api.clients[mac] sensors.append(UniFiUpTimeSensor(client, controller)) - if sensors: - async_add_entities(sensors) + async_add_entities(sensors) class UniFiBandwidthSensor(UniFiClient, SensorEntity): diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py index 72083cdc219..fefcfcc56c6 100644 --- a/homeassistant/components/unifi/switch.py +++ b/homeassistant/components/unifi/switch.py @@ -124,8 +124,7 @@ def add_block_entities(controller, async_add_entities, clients): client = controller.api.clients[mac] switches.append(UniFiBlockClientSwitch(client, controller)) - if switches: - async_add_entities(switches) + async_add_entities(switches) @callback @@ -175,8 +174,7 @@ def add_poe_entities(controller, async_add_entities, clients, known_poe_clients) switches.append(UniFiPOEClientSwitch(client, controller)) - if switches: - async_add_entities(switches) + async_add_entities(switches) @callback @@ -193,8 +191,7 @@ def add_dpi_entities(controller, async_add_entities, dpi_groups): switches.append(UniFiDPIRestrictionSwitch(dpi_groups[group], controller)) - if switches: - async_add_entities(switches) + async_add_entities(switches) @callback @@ -213,8 +210,7 @@ def add_outlet_entities(controller, async_add_entities, devices): if outlet.has_relay: switches.append(UniFiOutletSwitch(device, controller, outlet.index)) - if switches: - async_add_entities(switches) + async_add_entities(switches) class UniFiPOEClientSwitch(UniFiClient, SwitchEntity, RestoreEntity): diff --git a/homeassistant/components/unifi/update.py b/homeassistant/components/unifi/update.py index ecfbe3549bf..76965c17dad 100644 --- a/homeassistant/components/unifi/update.py +++ b/homeassistant/components/unifi/update.py @@ -64,8 +64,7 @@ def add_device_update_entities(controller, async_add_entities, devices): device = controller.api.devices[mac] entities.append(UniFiDeviceUpdateEntity(device, controller)) - if entities: - async_add_entities(entities) + async_add_entities(entities) class UniFiDeviceUpdateEntity(UniFiBase, UpdateEntity): diff --git a/homeassistant/components/wemo/light.py b/homeassistant/components/wemo/light.py index 3ff0f115a04..2767d44032c 100644 --- a/homeassistant/components/wemo/light.py +++ b/homeassistant/components/wemo/light.py @@ -76,8 +76,7 @@ def async_setup_bridge( known_light_ids.add(light_id) new_lights.append(WemoLight(coordinator, light)) - if new_lights: - async_add_entities(new_lights) + async_add_entities(new_lights) async_update_lights() config_entry.async_on_unload(coordinator.async_add_listener(async_update_lights)) diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py index 74af6cc0793..2c684013765 100644 --- a/homeassistant/components/wled/light.py +++ b/homeassistant/components/wled/light.py @@ -270,5 +270,4 @@ def async_update_segments( current_ids.add(segment_id) new_entities.append(WLEDSegmentLight(coordinator, segment_id)) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) diff --git a/homeassistant/components/wled/number.py b/homeassistant/components/wled/number.py index 05c517192a0..eb029a07db7 100644 --- a/homeassistant/components/wled/number.py +++ b/homeassistant/components/wled/number.py @@ -147,5 +147,4 @@ def async_update_segments( for desc in NUMBERS: new_entities.append(WLEDNumber(coordinator, segment_id, desc)) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) diff --git a/homeassistant/components/wled/select.py b/homeassistant/components/wled/select.py index 5b0de05370c..badde5515d4 100644 --- a/homeassistant/components/wled/select.py +++ b/homeassistant/components/wled/select.py @@ -195,5 +195,4 @@ def async_update_segments( current_ids.add(segment_id) new_entities.append(WLEDPaletteSelect(coordinator, segment_id)) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) diff --git a/homeassistant/components/wled/switch.py b/homeassistant/components/wled/switch.py index 20b5a618726..9f241756e90 100644 --- a/homeassistant/components/wled/switch.py +++ b/homeassistant/components/wled/switch.py @@ -215,5 +215,4 @@ def async_update_segments( current_ids.add(segment_id) new_entities.append(WLEDReverseSwitch(coordinator, segment_id)) - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) diff --git a/homeassistant/components/xbox/binary_sensor.py b/homeassistant/components/xbox/binary_sensor.py index ac97d502c55..3c262bce82e 100644 --- a/homeassistant/components/xbox/binary_sensor.py +++ b/homeassistant/components/xbox/binary_sensor.py @@ -62,8 +62,7 @@ def async_update_friends( ] new_entities = new_entities + current[xuid] - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) # Process deleted favorites, remove them from Home Assistant for xuid in current_ids - new_ids: diff --git a/homeassistant/components/xbox/sensor.py b/homeassistant/components/xbox/sensor.py index 9cba49d1dcb..77d52719c88 100644 --- a/homeassistant/components/xbox/sensor.py +++ b/homeassistant/components/xbox/sensor.py @@ -64,8 +64,7 @@ def async_update_friends( ] new_entities = new_entities + current[xuid] - if new_entities: - async_add_entities(new_entities) + async_add_entities(new_entities) # Process deleted favorites, remove them from Home Assistant for xuid in current_ids - new_ids: diff --git a/homeassistant/components/xbox_live/sensor.py b/homeassistant/components/xbox_live/sensor.py index 3081f334821..07adcbeb5cc 100644 --- a/homeassistant/components/xbox_live/sensor.py +++ b/homeassistant/components/xbox_live/sensor.py @@ -60,8 +60,7 @@ def setup_platform( continue entities.append(XboxSensor(api, xuid, gamercard, interval)) - if entities: - add_entities(entities, True) + add_entities(entities, True) def get_user_gamercard(api, xuid):