From f49a39218851671282a7813baf64a1e69b4cc699 Mon Sep 17 00:00:00 2001
From: Vincent Le Bourlot <vlebourl@gmail.com>
Date: Mon, 3 Feb 2020 13:30:44 +0100
Subject: [PATCH] Add guard clause for discovery_info to tahoma platforms
 (#31434)

---
 homeassistant/components/tahoma/binary_sensor.py | 2 ++
 homeassistant/components/tahoma/cover.py         | 2 ++
 homeassistant/components/tahoma/scene.py         | 2 ++
 homeassistant/components/tahoma/sensor.py        | 2 ++
 homeassistant/components/tahoma/switch.py        | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/homeassistant/components/tahoma/binary_sensor.py b/homeassistant/components/tahoma/binary_sensor.py
index 81078ab480b..7621a542838 100644
--- a/homeassistant/components/tahoma/binary_sensor.py
+++ b/homeassistant/components/tahoma/binary_sensor.py
@@ -14,6 +14,8 @@ SCAN_INTERVAL = timedelta(seconds=120)
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma controller devices."""
+    if discovery_info is None:
+        return
     _LOGGER.debug("Setup Tahoma Binary sensor platform")
     controller = hass.data[TAHOMA_DOMAIN]["controller"]
     devices = []
diff --git a/homeassistant/components/tahoma/cover.py b/homeassistant/components/tahoma/cover.py
index fb2bedc746c..7692e9bedf7 100644
--- a/homeassistant/components/tahoma/cover.py
+++ b/homeassistant/components/tahoma/cover.py
@@ -51,6 +51,8 @@ TAHOMA_DEVICE_CLASSES = {
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tahoma covers."""
+    if discovery_info is None:
+        return
     controller = hass.data[TAHOMA_DOMAIN]["controller"]
     devices = []
     for device in hass.data[TAHOMA_DOMAIN]["devices"]["cover"]:
diff --git a/homeassistant/components/tahoma/scene.py b/homeassistant/components/tahoma/scene.py
index e54ff91a0f6..c60f245fc50 100644
--- a/homeassistant/components/tahoma/scene.py
+++ b/homeassistant/components/tahoma/scene.py
@@ -10,6 +10,8 @@ _LOGGER = logging.getLogger(__name__)
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tahoma scenes."""
+    if discovery_info is None:
+        return
     controller = hass.data[TAHOMA_DOMAIN]["controller"]
     scenes = []
     for scene in hass.data[TAHOMA_DOMAIN]["scenes"]:
diff --git a/homeassistant/components/tahoma/sensor.py b/homeassistant/components/tahoma/sensor.py
index 85ccb55761d..fb8c61607c7 100644
--- a/homeassistant/components/tahoma/sensor.py
+++ b/homeassistant/components/tahoma/sensor.py
@@ -16,6 +16,8 @@ ATTR_RSSI_LEVEL = "rssi_level"
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma controller devices."""
+    if discovery_info is None:
+        return
     controller = hass.data[TAHOMA_DOMAIN]["controller"]
     devices = []
     for device in hass.data[TAHOMA_DOMAIN]["devices"]["sensor"]:
diff --git a/homeassistant/components/tahoma/switch.py b/homeassistant/components/tahoma/switch.py
index 1612120f313..9f98e711ac9 100644
--- a/homeassistant/components/tahoma/switch.py
+++ b/homeassistant/components/tahoma/switch.py
@@ -13,6 +13,8 @@ ATTR_RSSI_LEVEL = "rssi_level"
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma switches."""
+    if discovery_info is None:
+        return
     controller = hass.data[TAHOMA_DOMAIN]["controller"]
     devices = []
     for switch in hass.data[TAHOMA_DOMAIN]["devices"]["switch"]: