Merge remote-tracking branch 'upstream/dev'

This commit is contained in:
Ryan Kraus committed 2015-04-25 14:49:02 -04:00
commit 97bb5bcb7d
2 files changed
+9 -4

No files matched your search

+7 -3
View File
@@ -6,9 +6,6 @@ devices. Also contains the base classes for ISY Sensors, Lights, and Switches.
import logging
from urllib.parse import urlparse
# addon library imports
import PyISY
# homeassistant imports
from homeassistant import bootstrap
from homeassistant.loader import get_component
@@ -38,6 +35,13 @@ def setup(hass, config):
Setup isy994 component.
This will automatically import associated lights, switches, and sensors.
"""
try:
import PyISY
except ImportError:
_LOGGER.error("Error while importing dependency PyISY.")
return False
# pylint: disable=global-statement
# check for required values in configuration file
if not validate_config(config,