Merge pull request #1327 from justyns/zwaveremote

Return early from setup_platform when zwave NETWORK is not configured
This commit is contained in:
Paulus Schoutsen 2016-02-18 20:27:43 -08:00
commit 560173e13b
3 changed files with 3 additions and 3 deletions

View File

@ -19,7 +19,7 @@ from homeassistant.components.zwave import (
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
""" Find and add Z-Wave lights. """ """ Find and add Z-Wave lights. """
if discovery_info is None: if discovery_info is None or NETWORK is None:
return return
node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]

View File

@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
# platform: zwave # platform: zwave
# #
# `setup_platform` will be called without `discovery_info`. # `setup_platform` will be called without `discovery_info`.
if discovery_info is None: if discovery_info is None or NETWORK is None:
return return
node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]

View File

@ -15,7 +15,7 @@ from homeassistant.components.zwave import (
# pylint: disable=unused-argument # pylint: disable=unused-argument
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
""" Find and return demo switches. """ """ Find and return demo switches. """
if discovery_info is None: if discovery_info is None or NETWORK is None:
return return
node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]] node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]