From a6f6f0ac5e662751b90239872e63532b7efe9bf6 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Sun, 5 Jun 2022 19:33:27 -0600 Subject: [PATCH] Fix unhandled exception when RainMachine coordinator data doesn't exist (#73055) --- homeassistant/components/rainmachine/binary_sensor.py | 7 +++++-- homeassistant/components/rainmachine/sensor.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/rainmachine/binary_sensor.py b/homeassistant/components/rainmachine/binary_sensor.py index 1818222a8f4..7a13515db3b 100644 --- a/homeassistant/components/rainmachine/binary_sensor.py +++ b/homeassistant/components/rainmachine/binary_sensor.py @@ -139,8 +139,11 @@ async def async_setup_entry( entry, coordinator, controller, description ) for description in BINARY_SENSOR_DESCRIPTIONS - if (coordinator := coordinators[description.api_category]) is not None - and key_exists(coordinator.data, description.data_key) + if ( + (coordinator := coordinators[description.api_category]) is not None + and coordinator.data + and key_exists(coordinator.data, description.data_key) + ) ] ) diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py index 522c57cf7a2..cc37189aa49 100644 --- a/homeassistant/components/rainmachine/sensor.py +++ b/homeassistant/components/rainmachine/sensor.py @@ -133,8 +133,11 @@ async def async_setup_entry( entry, coordinator, controller, description ) for description in SENSOR_DESCRIPTIONS - if (coordinator := coordinators[description.api_category]) is not None - and key_exists(coordinator.data, description.data_key) + if ( + (coordinator := coordinators[description.api_category]) is not None + and coordinator.data + and key_exists(coordinator.data, description.data_key) + ) ] zone_coordinator = coordinators[DATA_ZONES]