mirror of
https://github.com/home-assistant/core.git
synced 2025-07-24 05:37:44 +00:00
Merge pull request #207 from rmkraus/isy_dev
Updating the PyISY dependency
This commit is contained in:
commit
b86e9a4fc1
@ -28,6 +28,7 @@ DISCOVER_SENSORS = "isy994.sensors"
|
|||||||
ISY = None
|
ISY = None
|
||||||
SENSOR_STRING = 'Sensor'
|
SENSOR_STRING = 'Sensor'
|
||||||
HIDDEN_STRING = '{HIDE ME}'
|
HIDDEN_STRING = '{HIDE ME}'
|
||||||
|
CONF_TLS_VER = 'tls'
|
||||||
|
|
||||||
# setup logger
|
# setup logger
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
@ -42,7 +43,6 @@ def setup(hass, config):
|
|||||||
import PyISY
|
import PyISY
|
||||||
except ImportError:
|
except ImportError:
|
||||||
_LOGGER.error("Error while importing dependency PyISY.")
|
_LOGGER.error("Error while importing dependency PyISY.")
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# pylint: disable=global-statement
|
# pylint: disable=global-statement
|
||||||
@ -74,10 +74,12 @@ def setup(hass, config):
|
|||||||
global HIDDEN_STRING
|
global HIDDEN_STRING
|
||||||
SENSOR_STRING = str(config[DOMAIN].get('sensor_string', SENSOR_STRING))
|
SENSOR_STRING = str(config[DOMAIN].get('sensor_string', SENSOR_STRING))
|
||||||
HIDDEN_STRING = str(config[DOMAIN].get('hidden_string', HIDDEN_STRING))
|
HIDDEN_STRING = str(config[DOMAIN].get('hidden_string', HIDDEN_STRING))
|
||||||
|
tls_version = config[DOMAIN].get(CONF_TLS_VER, None)
|
||||||
|
|
||||||
# connect to ISY controller
|
# connect to ISY controller
|
||||||
global ISY
|
global ISY
|
||||||
ISY = PyISY.ISY(addr, port, user, password, use_https=https, log=_LOGGER)
|
ISY = PyISY.ISY(addr, port, user, password, use_https=https,
|
||||||
|
tls_ver=tls_version, log=_LOGGER)
|
||||||
if not ISY.connected:
|
if not ISY.connected:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ python-nest>=2.3.1
|
|||||||
pydispatcher>=2.0.5
|
pydispatcher>=2.0.5
|
||||||
|
|
||||||
# ISY994 bindings (*.isy994)
|
# ISY994 bindings (*.isy994)
|
||||||
PyISY>=1.0.2
|
PyISY>=1.0.5
|
||||||
|
|
||||||
# PSutil (sensor.systemmonitor)
|
# PSutil (sensor.systemmonitor)
|
||||||
psutil>=3.0.0
|
psutil>=3.0.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user