diff --git a/homeassistant/components/satel_integra/__init__.py b/homeassistant/components/satel_integra/__init__.py index a657f6239d1..1972eefd6b5 100644 --- a/homeassistant/components/satel_integra/__init__.py +++ b/homeassistant/components/satel_integra/__init__.py @@ -2,9 +2,10 @@ import collections import logging +from satel_integra.satel_integra import AsyncSatel import voluptuous as vol -from homeassistant.const import EVENT_HOMEASSISTANT_STOP, CONF_HOST, CONF_PORT +from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP from homeassistant.core import callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.discovery import async_load_platform @@ -102,8 +103,6 @@ async def async_setup(hass, config): port = conf.get(CONF_PORT) partitions = conf.get(CONF_DEVICE_PARTITIONS) - from satel_integra.satel_integra import AsyncSatel - monitored_outputs = collections.OrderedDict( list(outputs.items()) + list(switchable_outputs.items()) ) diff --git a/homeassistant/components/satel_integra/alarm_control_panel.py b/homeassistant/components/satel_integra/alarm_control_panel.py index c4321673061..d4294788fdd 100644 --- a/homeassistant/components/satel_integra/alarm_control_panel.py +++ b/homeassistant/components/satel_integra/alarm_control_panel.py @@ -3,6 +3,8 @@ import asyncio from collections import OrderedDict import logging +from satel_integra.satel_integra import AlarmState + import homeassistant.components.alarm_control_panel as alarm from homeassistant.components.alarm_control_panel.const import ( SUPPORT_ALARM_ARM_AWAY, @@ -82,7 +84,6 @@ class SatelIntegraAlarmPanel(alarm.AlarmControlPanel): def _read_alarm_state(self): """Read current status of the alarm and translate it into HA status.""" - from satel_integra.satel_integra import AlarmState # Default - disarmed: hass_alarm_status = STATE_ALARM_DISARMED diff --git a/homeassistant/components/satel_integra/binary_sensor.py b/homeassistant/components/satel_integra/binary_sensor.py index 1e4877229b9..cbe760c06bf 100644 --- a/homeassistant/components/satel_integra/binary_sensor.py +++ b/homeassistant/components/satel_integra/binary_sensor.py @@ -10,9 +10,9 @@ from . import ( CONF_ZONE_NAME, CONF_ZONE_TYPE, CONF_ZONES, + DATA_SATEL, SIGNAL_OUTPUTS_UPDATED, SIGNAL_ZONES_UPDATED, - DATA_SATEL, ) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/satel_integra/switch.py b/homeassistant/components/satel_integra/switch.py index 5b5e4f3095b..c20f30cf871 100644 --- a/homeassistant/components/satel_integra/switch.py +++ b/homeassistant/components/satel_integra/switch.py @@ -9,8 +9,8 @@ from . import ( CONF_DEVICE_CODE, CONF_SWITCHABLE_OUTPUTS, CONF_ZONE_NAME, - SIGNAL_OUTPUTS_UPDATED, DATA_SATEL, + SIGNAL_OUTPUTS_UPDATED, ) _LOGGER = logging.getLogger(__name__)