Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1327 from justyns/zwaveremote 

Return early from setup_platform when zwave NETWORK is not configured
pull/1330/head
Paulus Schoutsen 2016-02-18 20:27:43 -08:00
parent acea32949b 9a740bff2a
commit 560173e13b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/light/zwave.py
View File

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

2
homeassistant/components/sensor/zwave.py
View File

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

2
homeassistant/components/switch/zwave.py
View File

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