From 52567b1a48e0f28a1fb2d9c5430fbf2238687cb1 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 13 Feb 2017 22:16:39 -0800 Subject: [PATCH] Fix Z-Wave node config (#5986) --- homeassistant/components/light/zwave.py | 2 +- homeassistant/components/zwave/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py index 89c25059d94..184688a7b96 100644 --- a/homeassistant/components/light/zwave.py +++ b/homeassistant/components/light/zwave.py @@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): node = zwave.NETWORK.nodes[discovery_info[zwave.const.ATTR_NODE_ID]] value = node.values[discovery_info[zwave.const.ATTR_VALUE_ID]] name = '{}.{}'.format(DOMAIN, zwave.object_id(value)) - node_config = hass.data[zwave.DATA_DEVICE_CONFIG].get(name) + node_config = hass.data[zwave.DATA_DEVICE_CONFIG].get(name) or {} refresh = node_config.get(zwave.CONF_REFRESH_VALUE) delay = node_config.get(zwave.CONF_REFRESH_DELAY) _LOGGER.debug('name=%s node_config=%s CONF_REFRESH_VALUE=%s' diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py index c729f6b2e12..b4ae7396414 100755 --- a/homeassistant/components/zwave/__init__.py +++ b/homeassistant/components/zwave/__init__.py @@ -385,7 +385,7 @@ def setup(hass, config): component = workaround_component name = "{}.{}".format(component, object_id(value)) - node_config = hass.data[DATA_DEVICE_CONFIG].get(name) + node_config = hass.data[DATA_DEVICE_CONFIG].get(name) or {} if node_config.get(CONF_IGNORED): _LOGGER.info("Ignoring device %s", name)