From d89bfcdaa5940ec255628ba47600e93a225d682b Mon Sep 17 00:00:00 2001
From: Josh Nichols <josh@technicalpickles.com>
Date: Sun, 4 Dec 2016 17:33:50 -0500
Subject: [PATCH] Make sure all nest platforms require discovery info (#4734)
---
homeassistant/components/binary_sensor/nest.py | 3 +++
homeassistant/components/camera/nest.py | 1 +
homeassistant/components/climate/nest.py | 3 ++-
homeassistant/components/sensor/nest.py | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/homeassistant/components/binary_sensor/nest.py b/homeassistant/components/binary_sensor/nest.py
index d78e33c9f95..070703df32a 100644
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -60,6 +60,9 @@ _LOGGER = logging.getLogger(__name__)
def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup Nest binary sensors."""
+ if discovery_info is None:
+ return
+
nest = hass.data[DATA_NEST]
conf = config.get(CONF_MONITORED_CONDITIONS, _VALID_BINARY_SENSOR_TYPES)
diff --git a/homeassistant/components/camera/nest.py b/homeassistant/components/camera/nest.py
index 8bda0e8eb9c..aa2041e07a6 100644
--- a/homeassistant/components/camera/nest.py
+++ b/homeassistant/components/camera/nest.py
@@ -26,6 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up a Nest Cam."""
if discovery_info is None:
return
+
camera_devices = hass.data[nest.DATA_NEST].camera_devices()
cameras = [NestCamera(structure, device)
for structure, device in camera_devices]
diff --git a/homeassistant/components/climate/nest.py b/homeassistant/components/climate/nest.py
index 06ec500f9e2..dbc68162579 100644
--- a/homeassistant/components/climate/nest.py
+++ b/homeassistant/components/climate/nest.py
@@ -31,10 +31,11 @@ STATE_HEAT_COOL = 'heat-cool'
def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the Nest thermostat."""
- _LOGGER.debug("Setting up nest thermostat")
if discovery_info is None:
return
+ _LOGGER.debug("Setting up nest thermostat")
+
temp_unit = hass.config.units.temperature_unit
add_devices(
diff --git a/homeassistant/components/sensor/nest.py b/homeassistant/components/sensor/nest.py
index b4909aebae3..53f767ab494 100644
--- a/homeassistant/components/sensor/nest.py
+++ b/homeassistant/components/sensor/nest.py
@@ -68,6 +68,9 @@ _LOGGER = logging.getLogger(__name__)
def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the Nest Sensor."""
+ if discovery_info is None:
+ return
+
nest = hass.data[DATA_NEST]
conf = config.get(CONF_MONITORED_CONDITIONS, _VALID_SENSOR_TYPES)
--
GitLab