diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py index 838d09b73..d7426e041 100644 --- a/homeassistant/components/abode/alarm_control_panel.py +++ b/homeassistant/components/abode/alarm_control_panel.py @@ -2,12 +2,12 @@ import logging import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.abode import ATTRIBUTION, AbodeDevice -from homeassistant.components.abode import DOMAIN as ABODE_DOMAIN from homeassistant.const import ( ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) +from . import ATTRIBUTION, DOMAIN as ABODE_DOMAIN, AbodeDevice + DEPENDENCIES = ['abode'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/abode/binary_sensor.py b/homeassistant/components/abode/binary_sensor.py index 47baef1d7..874723420 100644 --- a/homeassistant/components/abode/binary_sensor.py +++ b/homeassistant/components/abode/binary_sensor.py @@ -1,10 +1,10 @@ """Support for Abode Security System binary sensors.""" import logging -from homeassistant.components.abode import (AbodeDevice, AbodeAutomation, - DOMAIN as ABODE_DOMAIN) from homeassistant.components.binary_sensor import BinarySensorDevice +from . import DOMAIN as ABODE_DOMAIN, AbodeAutomation, AbodeDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['abode'] diff --git a/homeassistant/components/abode/camera.py b/homeassistant/components/abode/camera.py index 99613d07c..d37644ecc 100644 --- a/homeassistant/components/abode/camera.py +++ b/homeassistant/components/abode/camera.py @@ -1,13 +1,14 @@ """Support for Abode Security System cameras.""" +from datetime import timedelta import logging -from datetime import timedelta import requests -from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN from homeassistant.components.camera import Camera from homeassistant.util import Throttle +from . import DOMAIN as ABODE_DOMAIN, AbodeDevice + DEPENDENCIES = ['abode'] MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90) diff --git a/homeassistant/components/abode/cover.py b/homeassistant/components/abode/cover.py index 03d6219eb..c40159164 100644 --- a/homeassistant/components/abode/cover.py +++ b/homeassistant/components/abode/cover.py @@ -1,9 +1,10 @@ """Support for Abode Security System covers.""" import logging -from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN from homeassistant.components.cover import CoverDevice +from . import DOMAIN as ABODE_DOMAIN, AbodeDevice + DEPENDENCIES = ['abode'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/abode/light.py b/homeassistant/components/abode/light.py index aabf5fbcc..9e88acce4 100644 --- a/homeassistant/components/abode/light.py +++ b/homeassistant/components/abode/light.py @@ -1,13 +1,14 @@ """Support for Abode Security System lights.""" import logging from math import ceil -from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN + from homeassistant.components.light import ( - ATTR_BRIGHTNESS, ATTR_HS_COLOR, ATTR_COLOR_TEMP, - SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) + ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, + SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) from homeassistant.util.color import ( color_temperature_kelvin_to_mired, color_temperature_mired_to_kelvin) +from . import DOMAIN as ABODE_DOMAIN, AbodeDevice DEPENDENCIES = ['abode'] diff --git a/homeassistant/components/abode/lock.py b/homeassistant/components/abode/lock.py index ce6634268..0f568a4ac 100644 --- a/homeassistant/components/abode/lock.py +++ b/homeassistant/components/abode/lock.py @@ -1,9 +1,10 @@ """Support for Abode Security System locks.""" import logging -from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN from homeassistant.components.lock import LockDevice +from . import DOMAIN as ABODE_DOMAIN, AbodeDevice + DEPENDENCIES = ['abode'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py index fa6cb9323..ef6941c76 100644 --- a/homeassistant/components/abode/sensor.py +++ b/homeassistant/components/abode/sensor.py @@ -1,10 +1,11 @@ """Support for Abode Security System sensors.""" import logging -from homeassistant.components.abode import AbodeDevice, DOMAIN as ABODE_DOMAIN from homeassistant.const import ( DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE) +from . import DOMAIN as ABODE_DOMAIN, AbodeDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['abode'] diff --git a/homeassistant/components/abode/switch.py b/homeassistant/components/abode/switch.py index d5303a27c..3e3ce0318 100644 --- a/homeassistant/components/abode/switch.py +++ b/homeassistant/components/abode/switch.py @@ -1,10 +1,10 @@ """Support for Abode Security System switches.""" import logging -from homeassistant.components.abode import (AbodeDevice, AbodeAutomation, - DOMAIN as ABODE_DOMAIN) from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as ABODE_DOMAIN, AbodeAutomation, AbodeDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['abode'] diff --git a/homeassistant/components/ads/binary_sensor.py b/homeassistant/components/ads/binary_sensor.py index 6771e99cd..3b935156d 100644 --- a/homeassistant/components/ads/binary_sensor.py +++ b/homeassistant/components/ads/binary_sensor.py @@ -3,12 +3,13 @@ import logging import voluptuous as vol -from homeassistant.components.ads import CONF_ADS_VAR, DATA_ADS from homeassistant.components.binary_sensor import ( DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME import homeassistant.helpers.config_validation as cv +from . import CONF_ADS_VAR, DATA_ADS + _LOGGER = logging.getLogger(__name__) DEFAULT_NAME = 'ADS binary sensor' diff --git a/homeassistant/components/ads/light.py b/homeassistant/components/ads/light.py index e5299821e..c61fd8136 100644 --- a/homeassistant/components/ads/light.py +++ b/homeassistant/components/ads/light.py @@ -1,13 +1,15 @@ """Support for ADS light sources.""" import logging + import voluptuous as vol -from homeassistant.components.light import Light, ATTR_BRIGHTNESS, \ - SUPPORT_BRIGHTNESS, PLATFORM_SCHEMA + +from homeassistant.components.light import ( + ATTR_BRIGHTNESS, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, Light) from homeassistant.const import CONF_NAME -from homeassistant.components.ads import DATA_ADS, CONF_ADS_VAR, \ - CONF_ADS_VAR_BRIGHTNESS import homeassistant.helpers.config_validation as cv +from . import CONF_ADS_VAR, CONF_ADS_VAR_BRIGHTNESS, DATA_ADS + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['ads'] DEFAULT_NAME = 'ADS Light' diff --git a/homeassistant/components/ads/sensor.py b/homeassistant/components/ads/sensor.py index 4db6ca7db..118a669a7 100644 --- a/homeassistant/components/ads/sensor.py +++ b/homeassistant/components/ads/sensor.py @@ -4,13 +4,13 @@ import logging import voluptuous as vol from homeassistant.components import ads -from homeassistant.components.ads import ( - CONF_ADS_FACTOR, CONF_ADS_TYPE, CONF_ADS_VAR) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_NAME, CONF_UNIT_OF_MEASUREMENT import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import CONF_ADS_FACTOR, CONF_ADS_TYPE, CONF_ADS_VAR + _LOGGER = logging.getLogger(__name__) DEFAULT_NAME = "ADS sensor" diff --git a/homeassistant/components/ads/switch.py b/homeassistant/components/ads/switch.py index e3aee023f..094b45523 100644 --- a/homeassistant/components/ads/switch.py +++ b/homeassistant/components/ads/switch.py @@ -3,12 +3,13 @@ import logging import voluptuous as vol -from homeassistant.components.ads import CONF_ADS_VAR, DATA_ADS from homeassistant.components.switch import PLATFORM_SCHEMA from homeassistant.const import CONF_NAME import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import ToggleEntity +from . import CONF_ADS_VAR, DATA_ADS + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['ads'] diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py index cf26e42b0..d7eced933 100644 --- a/homeassistant/components/alarmdecoder/alarm_control_panel.py +++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py @@ -4,12 +4,13 @@ import logging import voluptuous as vol import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.alarmdecoder import DATA_AD, SIGNAL_PANEL_MESSAGE from homeassistant.const import ( ATTR_CODE, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED) import homeassistant.helpers.config_validation as cv +from . import DATA_AD, SIGNAL_PANEL_MESSAGE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['alarmdecoder'] diff --git a/homeassistant/components/alarmdecoder/binary_sensor.py b/homeassistant/components/alarmdecoder/binary_sensor.py index c5af6ea79..09e63b4d6 100644 --- a/homeassistant/components/alarmdecoder/binary_sensor.py +++ b/homeassistant/components/alarmdecoder/binary_sensor.py @@ -2,11 +2,11 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.alarmdecoder import ( - ZONE_SCHEMA, CONF_ZONES, CONF_ZONE_NAME, CONF_ZONE_TYPE, - CONF_ZONE_RFID, CONF_ZONE_LOOP, SIGNAL_ZONE_FAULT, SIGNAL_ZONE_RESTORE, - SIGNAL_RFX_MESSAGE, SIGNAL_REL_MESSAGE, CONF_RELAY_ADDR, - CONF_RELAY_CHAN) + +from . import ( + CONF_RELAY_ADDR, CONF_RELAY_CHAN, CONF_ZONE_LOOP, CONF_ZONE_NAME, + CONF_ZONE_RFID, CONF_ZONE_TYPE, CONF_ZONES, SIGNAL_REL_MESSAGE, + SIGNAL_RFX_MESSAGE, SIGNAL_ZONE_FAULT, SIGNAL_ZONE_RESTORE, ZONE_SCHEMA) DEPENDENCIES = ['alarmdecoder'] diff --git a/homeassistant/components/alarmdecoder/sensor.py b/homeassistant/components/alarmdecoder/sensor.py index b2f697ea8..88371dad1 100644 --- a/homeassistant/components/alarmdecoder/sensor.py +++ b/homeassistant/components/alarmdecoder/sensor.py @@ -2,7 +2,8 @@ import logging from homeassistant.helpers.entity import Entity -from homeassistant.components.alarmdecoder import (SIGNAL_PANEL_MESSAGE) + +from . import SIGNAL_PANEL_MESSAGE _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ambient_station/binary_sensor.py b/homeassistant/components/ambient_station/binary_sensor.py index 2defa0328..04a389016 100644 --- a/homeassistant/components/ambient_station/binary_sensor.py +++ b/homeassistant/components/ambient_station/binary_sensor.py @@ -1,13 +1,13 @@ """Support for Ambient Weather Station binary sensors.""" import logging -from homeassistant.components.ambient_station import ( - SENSOR_TYPES, TYPE_BATT1, TYPE_BATT10, TYPE_BATT2, TYPE_BATT3, TYPE_BATT4, - TYPE_BATT5, TYPE_BATT6, TYPE_BATT7, TYPE_BATT8, TYPE_BATT9, TYPE_BATTOUT, - AmbientWeatherEntity) from homeassistant.components.binary_sensor import BinarySensorDevice from homeassistant.const import ATTR_NAME +from . import ( + SENSOR_TYPES, TYPE_BATT1, TYPE_BATT2, TYPE_BATT3, TYPE_BATT4, TYPE_BATT5, + TYPE_BATT6, TYPE_BATT7, TYPE_BATT8, TYPE_BATT9, TYPE_BATT10, TYPE_BATTOUT, + AmbientWeatherEntity) from .const import ATTR_LAST_DATA, DATA_CLIENT, DOMAIN, TYPE_BINARY_SENSOR _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py index fa3222bf0..b394dc558 100644 --- a/homeassistant/components/ambient_station/sensor.py +++ b/homeassistant/components/ambient_station/sensor.py @@ -1,10 +1,9 @@ """Support for Ambient Weather Station sensors.""" import logging -from homeassistant.components.ambient_station import ( - SENSOR_TYPES, AmbientWeatherEntity) from homeassistant.const import ATTR_NAME +from . import SENSOR_TYPES, AmbientWeatherEntity from .const import ATTR_LAST_DATA, DATA_CLIENT, DOMAIN, TYPE_SENSOR _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/amcrest/camera.py b/homeassistant/components/amcrest/camera.py index 32885c2a8..7ba3ea04b 100644 --- a/homeassistant/components/amcrest/camera.py +++ b/homeassistant/components/amcrest/camera.py @@ -2,15 +2,14 @@ import asyncio import logging -from homeassistant.components.amcrest import ( - DATA_AMCREST, STREAM_SOURCE_LIST, TIMEOUT) from homeassistant.components.camera import Camera from homeassistant.components.ffmpeg import DATA_FFMPEG from homeassistant.const import CONF_NAME from homeassistant.helpers.aiohttp_client import ( - async_get_clientsession, async_aiohttp_proxy_web, - async_aiohttp_proxy_stream) + async_aiohttp_proxy_stream, async_aiohttp_proxy_web, + async_get_clientsession) +from . import DATA_AMCREST, STREAM_SOURCE_LIST, TIMEOUT DEPENDENCIES = ['amcrest', 'ffmpeg'] diff --git a/homeassistant/components/amcrest/sensor.py b/homeassistant/components/amcrest/sensor.py index 4869dfffa..c721914c7 100644 --- a/homeassistant/components/amcrest/sensor.py +++ b/homeassistant/components/amcrest/sensor.py @@ -2,9 +2,10 @@ from datetime import timedelta import logging -from homeassistant.components.amcrest import DATA_AMCREST, SENSORS -from homeassistant.helpers.entity import Entity from homeassistant.const import CONF_NAME, CONF_SENSORS +from homeassistant.helpers.entity import Entity + +from . import DATA_AMCREST, SENSORS DEPENDENCIES = ['amcrest'] diff --git a/homeassistant/components/amcrest/switch.py b/homeassistant/components/amcrest/switch.py index 3c1f03f01..0bbd290b3 100644 --- a/homeassistant/components/amcrest/switch.py +++ b/homeassistant/components/amcrest/switch.py @@ -1,11 +1,11 @@ """Support for toggling Amcrest IP camera settings.""" import logging -from homeassistant.components.amcrest import DATA_AMCREST, SWITCHES -from homeassistant.const import ( - CONF_NAME, CONF_SWITCHES, STATE_OFF, STATE_ON) +from homeassistant.const import CONF_NAME, CONF_SWITCHES, STATE_OFF, STATE_ON from homeassistant.helpers.entity import ToggleEntity +from . import DATA_AMCREST, SWITCHES + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['amcrest'] diff --git a/homeassistant/components/android_ip_webcam/binary_sensor.py b/homeassistant/components/android_ip_webcam/binary_sensor.py index e33e22f37..c058c44c5 100644 --- a/homeassistant/components/android_ip_webcam/binary_sensor.py +++ b/homeassistant/components/android_ip_webcam/binary_sensor.py @@ -1,7 +1,7 @@ """Support for Android IP Webcam binary sensors.""" from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.android_ip_webcam import ( - KEY_MAP, DATA_IP_WEBCAM, AndroidIPCamEntity, CONF_HOST, CONF_NAME) + +from . import CONF_HOST, CONF_NAME, DATA_IP_WEBCAM, KEY_MAP, AndroidIPCamEntity DEPENDENCIES = ['android_ip_webcam'] diff --git a/homeassistant/components/android_ip_webcam/sensor.py b/homeassistant/components/android_ip_webcam/sensor.py index e98ce7951..4d29493d6 100644 --- a/homeassistant/components/android_ip_webcam/sensor.py +++ b/homeassistant/components/android_ip_webcam/sensor.py @@ -1,9 +1,10 @@ """Support for Android IP Webcam sensors.""" -from homeassistant.components.android_ip_webcam import ( - KEY_MAP, ICON_MAP, DATA_IP_WEBCAM, AndroidIPCamEntity, CONF_HOST, - CONF_NAME, CONF_SENSORS) from homeassistant.helpers.icon import icon_for_battery_level +from . import ( + CONF_HOST, CONF_NAME, CONF_SENSORS, DATA_IP_WEBCAM, ICON_MAP, KEY_MAP, + AndroidIPCamEntity) + DEPENDENCIES = ['android_ip_webcam'] diff --git a/homeassistant/components/android_ip_webcam/switch.py b/homeassistant/components/android_ip_webcam/switch.py index 73a94acbc..0304c5747 100644 --- a/homeassistant/components/android_ip_webcam/switch.py +++ b/homeassistant/components/android_ip_webcam/switch.py @@ -1,8 +1,9 @@ """Support for Android IP Webcam settings.""" from homeassistant.components.switch import SwitchDevice -from homeassistant.components.android_ip_webcam import ( - KEY_MAP, ICON_MAP, DATA_IP_WEBCAM, AndroidIPCamEntity, CONF_HOST, - CONF_NAME, CONF_SWITCHES) + +from . import ( + CONF_HOST, CONF_NAME, CONF_SWITCHES, DATA_IP_WEBCAM, ICON_MAP, KEY_MAP, + AndroidIPCamEntity) DEPENDENCIES = ['android_ip_webcam'] diff --git a/homeassistant/components/apple_tv/media_player.py b/homeassistant/components/apple_tv/media_player.py index 03ac5bd25..e00ce6ed1 100644 --- a/homeassistant/components/apple_tv/media_player.py +++ b/homeassistant/components/apple_tv/media_player.py @@ -1,8 +1,6 @@ """Support for Apple TV media player.""" import logging -from homeassistant.components.apple_tv import ( - ATTR_ATV, ATTR_POWER, DATA_APPLE_TV, DATA_ENTITIES) from homeassistant.components.media_player import MediaPlayerDevice from homeassistant.components.media_player.const import ( MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_VIDEO, SUPPORT_NEXT_TRACK, @@ -14,6 +12,8 @@ from homeassistant.const import ( from homeassistant.core import callback import homeassistant.util.dt as dt_util +from . import ATTR_ATV, ATTR_POWER, DATA_APPLE_TV, DATA_ENTITIES + DEPENDENCIES = ['apple_tv'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/apple_tv/remote.py b/homeassistant/components/apple_tv/remote.py index 2d80ded68..25b500ac0 100644 --- a/homeassistant/components/apple_tv/remote.py +++ b/homeassistant/components/apple_tv/remote.py @@ -1,8 +1,8 @@ """Remote control support for Apple TV.""" -from homeassistant.components.apple_tv import ( - ATTR_ATV, ATTR_POWER, DATA_APPLE_TV) from homeassistant.components import remote -from homeassistant.const import (CONF_NAME, CONF_HOST) +from homeassistant.const import CONF_HOST, CONF_NAME + +from . import ATTR_ATV, ATTR_POWER, DATA_APPLE_TV DEPENDENCIES = ['apple_tv'] diff --git a/homeassistant/components/aqualogic/sensor.py b/homeassistant/components/aqualogic/sensor.py index 9e061ba91..dc06a2127 100644 --- a/homeassistant/components/aqualogic/sensor.py +++ b/homeassistant/components/aqualogic/sensor.py @@ -4,12 +4,13 @@ import logging import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.const import (CONF_MONITORED_CONDITIONS, - TEMP_CELSIUS, TEMP_FAHRENHEIT) +from homeassistant.const import ( + CONF_MONITORED_CONDITIONS, TEMP_CELSIUS, TEMP_FAHRENHEIT) from homeassistant.core import callback -from homeassistant.helpers.entity import Entity -import homeassistant.components.aqualogic as aq import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import Entity + +from . import DOMAIN, UPDATE_TOPIC _LOGGER = logging.getLogger(__name__) @@ -46,7 +47,7 @@ async def async_setup_platform( """Set up the sensor platform.""" sensors = [] - processor = hass.data[aq.DOMAIN] + processor = hass.data[DOMAIN] for sensor_type in config.get(CONF_MONITORED_CONDITIONS): sensors.append(AquaLogicSensor(processor, sensor_type)) @@ -95,7 +96,7 @@ class AquaLogicSensor(Entity): async def async_added_to_hass(self): """Register callbacks.""" self.hass.helpers.dispatcher.async_dispatcher_connect( - aq.UPDATE_TOPIC, self.async_update_callback) + UPDATE_TOPIC, self.async_update_callback) @callback def async_update_callback(self): diff --git a/homeassistant/components/aqualogic/switch.py b/homeassistant/components/aqualogic/switch.py index ee040fa1b..21e573f94 100644 --- a/homeassistant/components/aqualogic/switch.py +++ b/homeassistant/components/aqualogic/switch.py @@ -3,11 +3,12 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +from homeassistant.const import CONF_MONITORED_CONDITIONS from homeassistant.core import callback -import homeassistant.components.aqualogic as aq -from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA -from homeassistant.const import (CONF_MONITORED_CONDITIONS) +import homeassistant.helpers.config_validation as cv + +from . import DOMAIN, UPDATE_TOPIC DEPENDENCIES = ['aqualogic'] @@ -37,7 +38,7 @@ async def async_setup_platform( """Set up the switch platform.""" switches = [] - processor = hass.data[aq.DOMAIN] + processor = hass.data[DOMAIN] for switch_type in config.get(CONF_MONITORED_CONDITIONS): switches.append(AquaLogicSwitch(processor, switch_type)) @@ -101,7 +102,7 @@ class AquaLogicSwitch(SwitchDevice): async def async_added_to_hass(self): """Register callbacks.""" self.hass.helpers.dispatcher.async_dispatcher_connect( - aq.UPDATE_TOPIC, self.async_update_callback) + UPDATE_TOPIC, self.async_update_callback) @callback def async_update_callback(self): diff --git a/homeassistant/components/arlo/alarm_control_panel.py b/homeassistant/components/arlo/alarm_control_panel.py index 931dfa1b1..3557ed125 100644 --- a/homeassistant/components/arlo/alarm_control_panel.py +++ b/homeassistant/components/arlo/alarm_control_panel.py @@ -3,16 +3,16 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.core import callback -from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.components.alarm_control_panel import ( - AlarmControlPanel, PLATFORM_SCHEMA) -from homeassistant.components.arlo import ( - DATA_ARLO, ATTRIBUTION, SIGNAL_UPDATE_ARLO) + PLATFORM_SCHEMA, AlarmControlPanel) from homeassistant.const import ( ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, - STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT) + STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED) +from homeassistant.core import callback +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ATTRIBUTION, DATA_ARLO, SIGNAL_UPDATE_ARLO _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/arlo/camera.py b/homeassistant/components/arlo/camera.py index 6f20ecdad..43ccabb73 100644 --- a/homeassistant/components/arlo/camera.py +++ b/homeassistant/components/arlo/camera.py @@ -3,16 +3,16 @@ import logging import voluptuous as vol -from homeassistant.core import callback -import homeassistant.helpers.config_validation as cv -from homeassistant.components.arlo import ( - DEFAULT_BRAND, DATA_ARLO, SIGNAL_UPDATE_ARLO) -from homeassistant.components.camera import Camera, PLATFORM_SCHEMA +from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.components.ffmpeg import DATA_FFMPEG from homeassistant.const import ATTR_BATTERY_LEVEL +from homeassistant.core import callback from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import DATA_ARLO, DEFAULT_BRAND, SIGNAL_UPDATE_ARLO + _LOGGER = logging.getLogger(__name__) ARLO_MODE_ARMED = 'armed' diff --git a/homeassistant/components/arlo/sensor.py b/homeassistant/components/arlo/sensor.py index 1c3cc9334..e08669eb8 100644 --- a/homeassistant/components/arlo/sensor.py +++ b/homeassistant/components/arlo/sensor.py @@ -3,19 +3,18 @@ import logging import voluptuous as vol -from homeassistant.core import callback -import homeassistant.helpers.config_validation as cv -from homeassistant.components.arlo import ( - ATTRIBUTION, DEFAULT_BRAND, DATA_ARLO, SIGNAL_UPDATE_ARLO) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - ATTR_ATTRIBUTION, CONF_MONITORED_CONDITIONS, TEMP_CELSIUS, - DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY) - + ATTR_ATTRIBUTION, CONF_MONITORED_CONDITIONS, DEVICE_CLASS_HUMIDITY, + DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS) +from homeassistant.core import callback +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity from homeassistant.helpers.icon import icon_for_battery_level +from . import ATTRIBUTION, DATA_ARLO, DEFAULT_BRAND, SIGNAL_UPDATE_ARLO + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['arlo'] diff --git a/homeassistant/components/asterisk_mbox/mailbox.py b/homeassistant/components/asterisk_mbox/mailbox.py index 9da4bd1a2..a3e7c3f4d 100644 --- a/homeassistant/components/asterisk_mbox/mailbox.py +++ b/homeassistant/components/asterisk_mbox/mailbox.py @@ -1,12 +1,13 @@ """Support for the Asterisk Voicemail interface.""" import logging -from homeassistant.components.asterisk_mbox import DOMAIN as ASTERISK_DOMAIN from homeassistant.components.mailbox import ( CONTENT_TYPE_MPEG, Mailbox, StreamError) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import DOMAIN as ASTERISK_DOMAIN + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['asterisk_mbox'] diff --git a/homeassistant/components/asuswrt/device_tracker.py b/homeassistant/components/asuswrt/device_tracker.py index 4630c3730..f5c6dd4a4 100644 --- a/homeassistant/components/asuswrt/device_tracker.py +++ b/homeassistant/components/asuswrt/device_tracker.py @@ -6,9 +6,10 @@ https://home-assistant.io/components/device_tracker.asuswrt/ """ import logging -from homeassistant.components.asuswrt import DATA_ASUSWRT from homeassistant.components.device_tracker import DeviceScanner +from . import DATA_ASUSWRT + DEPENDENCIES = ['asuswrt'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/asuswrt/sensor.py b/homeassistant/components/asuswrt/sensor.py index 08e2ec27c..53d232862 100644 --- a/homeassistant/components/asuswrt/sensor.py +++ b/homeassistant/components/asuswrt/sensor.py @@ -7,7 +7,8 @@ https://home-assistant.io/components/sensor.asuswrt/ import logging from homeassistant.helpers.entity import Entity -from homeassistant.components.asuswrt import DATA_ASUSWRT + +from . import DATA_ASUSWRT DEPENDENCIES = ['asuswrt'] diff --git a/homeassistant/components/august/binary_sensor.py b/homeassistant/components/august/binary_sensor.py index 1ad2d80ce..3a69d4117 100644 --- a/homeassistant/components/august/binary_sensor.py +++ b/homeassistant/components/august/binary_sensor.py @@ -1,9 +1,10 @@ """Support for August binary sensors.""" +from datetime import datetime, timedelta import logging -from datetime import timedelta, datetime -from homeassistant.components.august import DATA_AUGUST -from homeassistant.components.binary_sensor import (BinarySensorDevice) +from homeassistant.components.binary_sensor import BinarySensorDevice + +from . import DATA_AUGUST _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/august/camera.py b/homeassistant/components/august/camera.py index 7420bb040..53a9d78bc 100644 --- a/homeassistant/components/august/camera.py +++ b/homeassistant/components/august/camera.py @@ -3,9 +3,10 @@ from datetime import timedelta import requests -from homeassistant.components.august import DATA_AUGUST, DEFAULT_TIMEOUT from homeassistant.components.camera import Camera +from . import DATA_AUGUST, DEFAULT_TIMEOUT + DEPENDENCIES = ['august'] SCAN_INTERVAL = timedelta(seconds=5) diff --git a/homeassistant/components/august/lock.py b/homeassistant/components/august/lock.py index ff355bbf8..e112eaa25 100644 --- a/homeassistant/components/august/lock.py +++ b/homeassistant/components/august/lock.py @@ -1,11 +1,12 @@ """Support for August lock.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.august import DATA_AUGUST from homeassistant.components.lock import LockDevice from homeassistant.const import ATTR_BATTERY_LEVEL +from . import DATA_AUGUST + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['august'] diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py index 5a7b19ce4..94776deef 100644 --- a/homeassistant/components/automation/__init__.py +++ b/homeassistant/components/automation/__init__.py @@ -6,20 +6,20 @@ import logging import voluptuous as vol -from homeassistant.setup import async_prepare_setup_platform -from homeassistant.core import CoreState, Context -from homeassistant.loader import bind_hass from homeassistant.const import ( - ATTR_ENTITY_ID, CONF_PLATFORM, STATE_ON, SERVICE_TURN_ON, SERVICE_TURN_OFF, - SERVICE_TOGGLE, SERVICE_RELOAD, EVENT_HOMEASSISTANT_START, CONF_ID, - EVENT_AUTOMATION_TRIGGERED, ATTR_NAME) + ATTR_ENTITY_ID, ATTR_NAME, CONF_ID, CONF_PLATFORM, + EVENT_AUTOMATION_TRIGGERED, EVENT_HOMEASSISTANT_START, SERVICE_RELOAD, + SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_ON) +from homeassistant.core import Context, CoreState from homeassistant.exceptions import HomeAssistantError -from homeassistant.helpers import extract_domain_configs, script, condition +from homeassistant.helpers import condition, extract_domain_configs, script +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.restore_state import RestoreEntity +from homeassistant.loader import bind_hass +from homeassistant.setup import async_prepare_setup_platform from homeassistant.util.dt import utcnow -import homeassistant.helpers.config_validation as cv DOMAIN = 'automation' DEPENDENCIES = ['group'] @@ -54,9 +54,8 @@ _LOGGER = logging.getLogger(__name__) def _platform_validator(config): """Validate it is a valid platform.""" try: - platform = importlib.import_module( - 'homeassistant.components.automation.{}'.format( - config[CONF_PLATFORM])) + platform = importlib.import_module('.{}'.format(config[CONF_PLATFORM]), + __name__) except ImportError: raise vol.Invalid('Invalid platform specified') from None diff --git a/homeassistant/components/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py index b9bf4a525..75e645dff 100644 --- a/homeassistant/components/blink/alarm_control_panel.py +++ b/homeassistant/components/blink/alarm_control_panel.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.alarm_control_panel import AlarmControlPanel -from homeassistant.components.blink import ( - BLINK_DATA, DEFAULT_ATTRIBUTION) from homeassistant.const import ( - ATTR_ATTRIBUTION, STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY) + ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED) + +from . import BLINK_DATA, DEFAULT_ATTRIBUTION _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py index fe0b95b15..466b73caf 100644 --- a/homeassistant/components/blink/binary_sensor.py +++ b/homeassistant/components/blink/binary_sensor.py @@ -1,8 +1,9 @@ """Support for Blink system camera control.""" -from homeassistant.components.blink import BLINK_DATA, BINARY_SENSORS from homeassistant.components.binary_sensor import BinarySensorDevice from homeassistant.const import CONF_MONITORED_CONDITIONS +from . import BINARY_SENSORS, BLINK_DATA + DEPENDENCIES = ['blink'] diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py index 2e5c024d6..1da3080e3 100644 --- a/homeassistant/components/blink/camera.py +++ b/homeassistant/components/blink/camera.py @@ -1,9 +1,10 @@ """Support for Blink system camera.""" import logging -from homeassistant.components.blink import BLINK_DATA, DEFAULT_BRAND from homeassistant.components.camera import Camera +from . import BLINK_DATA, DEFAULT_BRAND + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['blink'] diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py index c1fdf9252..0e97db9d7 100644 --- a/homeassistant/components/blink/sensor.py +++ b/homeassistant/components/blink/sensor.py @@ -1,9 +1,10 @@ """Support for Blink system camera sensors.""" import logging -from homeassistant.components.blink import BLINK_DATA, SENSORS -from homeassistant.helpers.entity import Entity from homeassistant.const import CONF_MONITORED_CONDITIONS +from homeassistant.helpers.entity import Entity + +from . import BLINK_DATA, SENSORS _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/bmw_connected_drive/binary_sensor.py b/homeassistant/components/bmw_connected_drive/binary_sensor.py index 1843f647d..deab15729 100644 --- a/homeassistant/components/bmw_connected_drive/binary_sensor.py +++ b/homeassistant/components/bmw_connected_drive/binary_sensor.py @@ -2,9 +2,10 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN from homeassistant.const import LENGTH_KILOMETERS +from . import DOMAIN as BMW_DOMAIN + DEPENDENCIES = ['bmw_connected_drive'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/bmw_connected_drive/device_tracker.py b/homeassistant/components/bmw_connected_drive/device_tracker.py index 21121b069..20e84e33e 100644 --- a/homeassistant/components/bmw_connected_drive/device_tracker.py +++ b/homeassistant/components/bmw_connected_drive/device_tracker.py @@ -1,10 +1,10 @@ """Device tracker for BMW Connected Drive vehicles.""" import logging -from homeassistant.components.bmw_connected_drive import DOMAIN \ - as BMW_DOMAIN from homeassistant.util import slugify +from . import DOMAIN as BMW_DOMAIN + DEPENDENCIES = ['bmw_connected_drive'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/bmw_connected_drive/lock.py b/homeassistant/components/bmw_connected_drive/lock.py index 8a5eddaa8..fe646dcd1 100644 --- a/homeassistant/components/bmw_connected_drive/lock.py +++ b/homeassistant/components/bmw_connected_drive/lock.py @@ -1,10 +1,11 @@ """Support for BMW car locks with BMW ConnectedDrive.""" import logging -from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN from homeassistant.components.lock import LockDevice from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED +from . import DOMAIN as BMW_DOMAIN + DEPENDENCIES = ['bmw_connected_drive'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py index a01142c53..03c03f01b 100644 --- a/homeassistant/components/bmw_connected_drive/sensor.py +++ b/homeassistant/components/bmw_connected_drive/sensor.py @@ -1,12 +1,13 @@ """Support for reading vehicle status from BMW connected drive portal.""" import logging -from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN +from homeassistant.const import ( + CONF_UNIT_SYSTEM_IMPERIAL, LENGTH_KILOMETERS, LENGTH_MILES, VOLUME_GALLONS, + VOLUME_LITERS) from homeassistant.helpers.entity import Entity from homeassistant.helpers.icon import icon_for_battery_level -from homeassistant.const import (CONF_UNIT_SYSTEM_IMPERIAL, VOLUME_LITERS, - VOLUME_GALLONS, LENGTH_KILOMETERS, - LENGTH_MILES) + +from . import DOMAIN as BMW_DOMAIN DEPENDENCIES = ['bmw_connected_drive'] diff --git a/homeassistant/components/bom/weather.py b/homeassistant/components/bom/weather.py index b35e7928e..2444192d8 100644 --- a/homeassistant/components/bom/weather.py +++ b/homeassistant/components/bom/weather.py @@ -3,14 +3,15 @@ import logging import voluptuous as vol -# Reuse data and API logic from the sensor implementation -from homeassistant.components.bom.sensor import ( - CONF_STATION, BOMCurrentData, closest_station, validate_station) from homeassistant.components.weather import PLATFORM_SCHEMA, WeatherEntity from homeassistant.const import ( CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_CELSIUS) from homeassistant.helpers import config_validation as cv +# Reuse data and API logic from the sensor implementation +from .sensor import ( + CONF_STATION, BOMCurrentData, closest_station, validate_station) + _LOGGER = logging.getLogger(__name__) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ diff --git a/homeassistant/components/buienradar/sensor.py b/homeassistant/components/buienradar/sensor.py index eeb65ab3c..fa386a177 100644 --- a/homeassistant/components/buienradar/sensor.py +++ b/homeassistant/components/buienradar/sensor.py @@ -8,19 +8,18 @@ import asyncio from datetime import datetime, timedelta import logging -import async_timeout import aiohttp +import async_timeout import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - ATTR_ATTRIBUTION, CONF_LATITUDE, CONF_LONGITUDE, - CONF_MONITORED_CONDITIONS, CONF_NAME, TEMP_CELSIUS) + ATTR_ATTRIBUTION, CONF_LATITUDE, CONF_LONGITUDE, CONF_MONITORED_CONDITIONS, + CONF_NAME, TEMP_CELSIUS) from homeassistant.helpers.aiohttp_client import async_get_clientsession +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity -from homeassistant.helpers.event import ( - async_track_point_in_utc_time) +from homeassistant.helpers.event import async_track_point_in_utc_time from homeassistant.util import dt as dt_util REQUIREMENTS = ['buienradar==0.91'] @@ -144,7 +143,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Create the buienradar sensor.""" - from homeassistant.components.buienradar.weather import DEFAULT_TIMEFRAME + from ..weather import DEFAULT_TIMEFRAME latitude = config.get(CONF_LATITUDE, hass.config.latitude) longitude = config.get(CONF_LONGITUDE, hass.config.longitude) diff --git a/homeassistant/components/buienradar/weather.py b/homeassistant/components/buienradar/weather.py index 585f9ac55..86dcb229a 100644 --- a/homeassistant/components/buienradar/weather.py +++ b/homeassistant/components/buienradar/weather.py @@ -3,8 +3,6 @@ import logging import voluptuous as vol -# Reuse data and API logic from the sensor implementation -from homeassistant.components.buienradar.sensor import BrData from homeassistant.components.weather import ( ATTR_FORECAST_CONDITION, ATTR_FORECAST_TEMP, ATTR_FORECAST_TEMP_LOW, ATTR_FORECAST_TIME, PLATFORM_SCHEMA, WeatherEntity) @@ -12,6 +10,9 @@ from homeassistant.const import ( CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_CELSIUS) from homeassistant.helpers import config_validation as cv +# Reuse data and API logic from the sensor implementation +from .sensor import BrData + REQUIREMENTS = ['buienradar==0.91'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/calendar/demo.py b/homeassistant/components/calendar/demo.py index bf9d4abeb..bd5724ca4 100644 --- a/homeassistant/components/calendar/demo.py +++ b/homeassistant/components/calendar/demo.py @@ -6,9 +6,10 @@ https://home-assistant.io/components/demo/ """ import copy -import homeassistant.util.dt as dt_util -from homeassistant.components.calendar import CalendarEventDevice, get_date from homeassistant.components.google import CONF_DEVICE_ID, CONF_NAME +import homeassistant.util.dt as dt_util + +from . import CalendarEventDevice, get_date def setup_platform(hass, config, add_entities, discovery_info=None): diff --git a/homeassistant/components/camera/demo.py b/homeassistant/components/camera/demo.py index f950edb5c..f9be3f47c 100644 --- a/homeassistant/components/camera/demo.py +++ b/homeassistant/components/camera/demo.py @@ -7,7 +7,7 @@ https://home-assistant.io/components/demo/ import logging import os -from homeassistant.components.camera import Camera, SUPPORT_ON_OFF +from . import SUPPORT_ON_OFF, Camera _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py index b22a76fdb..617942246 100644 --- a/homeassistant/components/canary/alarm_control_panel.py +++ b/homeassistant/components/canary/alarm_control_panel.py @@ -7,9 +7,11 @@ https://home-assistant.io/components/alarm_control_panel.canary/ import logging from homeassistant.components.alarm_control_panel import AlarmControlPanel -from homeassistant.components.canary import DATA_CANARY -from homeassistant.const import STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY, \ - STATE_ALARM_ARMED_NIGHT, STATE_ALARM_ARMED_HOME +from homeassistant.const import ( + STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, + STATE_ALARM_DISARMED) + +from . import DATA_CANARY DEPENDENCIES = ['canary'] diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py index eb0c8f3fc..c54565d6f 100644 --- a/homeassistant/components/canary/camera.py +++ b/homeassistant/components/canary/camera.py @@ -5,18 +5,19 @@ For more details about this platform, please refer to the documentation at https://home-assistant.io/components/camera.canary/ """ import asyncio -import logging from datetime import timedelta +import logging import voluptuous as vol -from homeassistant.components.camera import Camera, PLATFORM_SCHEMA -from homeassistant.components.canary import DATA_CANARY, DEFAULT_TIMEOUT +from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.components.ffmpeg import DATA_FFMPEG from homeassistant.helpers import config_validation as cv from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream from homeassistant.util import Throttle +from . import DATA_CANARY, DEFAULT_TIMEOUT + CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments' DEPENDENCIES = ['canary', 'ffmpeg'] diff --git a/homeassistant/components/canary/sensor.py b/homeassistant/components/canary/sensor.py index 015c6b378..d24c00c92 100644 --- a/homeassistant/components/canary/sensor.py +++ b/homeassistant/components/canary/sensor.py @@ -5,11 +5,12 @@ For more details about this platform, please refer to the documentation at https://home-assistant.io/components/sensor.canary/ """ -from homeassistant.components.canary import DATA_CANARY from homeassistant.const import TEMP_CELSIUS from homeassistant.helpers.entity import Entity from homeassistant.helpers.icon import icon_for_battery_level +from . import DATA_CANARY + DEPENDENCIES = ['canary'] SENSOR_VALUE_PRECISION = 2 diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py index 28373cc6c..77332883a 100644 --- a/homeassistant/components/cast/media_player.py +++ b/homeassistant/components/cast/media_player.py @@ -7,14 +7,13 @@ from typing import Optional, Tuple import attr import voluptuous as vol -from homeassistant.components.cast import DOMAIN as CAST_DOMAIN from homeassistant.components.media_player import ( - MediaPlayerDevice, PLATFORM_SCHEMA) + PLATFORM_SCHEMA, MediaPlayerDevice) from homeassistant.components.media_player.const import ( - MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, - SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, - SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, - SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET) + MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, SUPPORT_NEXT_TRACK, + SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, + SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, + SUPPORT_VOLUME_SET) from homeassistant.const import ( CONF_HOST, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING) @@ -26,6 +25,8 @@ from homeassistant.helpers.dispatcher import ( from homeassistant.helpers.typing import ConfigType, HomeAssistantType import homeassistant.util.dt as dt_util +from . import DOMAIN as CAST_DOMAIN + DEPENDENCIES = ('cast',) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/climate/demo.py b/homeassistant/components/climate/demo.py index 5b4775982..2dd31c1b2 100644 --- a/homeassistant/components/climate/demo.py +++ b/homeassistant/components/climate/demo.py @@ -4,16 +4,16 @@ Demo platform that offers a fake climate device. For more details about this platform, please refer to the documentation https://home-assistant.io/components/demo/ """ -from homeassistant.components.climate import ClimateDevice -from homeassistant.components.climate.const import ( - ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, - SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_HUMIDITY, - SUPPORT_TARGET_HUMIDITY_LOW, SUPPORT_TARGET_HUMIDITY_HIGH, - SUPPORT_AWAY_MODE, SUPPORT_HOLD_MODE, SUPPORT_FAN_MODE, - SUPPORT_OPERATION_MODE, SUPPORT_AUX_HEAT, SUPPORT_SWING_MODE, - SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW, - SUPPORT_ON_OFF) -from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE +from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT + +from . import ClimateDevice +from .const import ( + ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, SUPPORT_AUX_HEAT, + SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE, SUPPORT_HOLD_MODE, SUPPORT_ON_OFF, + SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE, SUPPORT_TARGET_HUMIDITY, + SUPPORT_TARGET_HUMIDITY_HIGH, SUPPORT_TARGET_HUMIDITY_LOW, + SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_TEMPERATURE_HIGH, + SUPPORT_TARGET_TEMPERATURE_LOW) SUPPORT_FLAGS = SUPPORT_TARGET_HUMIDITY_LOW | SUPPORT_TARGET_HUMIDITY_HIGH diff --git a/homeassistant/components/climate/generic_thermostat.py b/homeassistant/components/climate/generic_thermostat.py index da4f79ec1..af0a3eea6 100644 --- a/homeassistant/components/climate/generic_thermostat.py +++ b/homeassistant/components/climate/generic_thermostat.py @@ -9,23 +9,23 @@ import logging import voluptuous as vol -from homeassistant.core import callback -from homeassistant.core import DOMAIN as HA_DOMAIN -from homeassistant.components.climate import ClimateDevice, PLATFORM_SCHEMA -from homeassistant.components.climate.const import ( - STATE_HEAT, STATE_COOL, STATE_IDLE, STATE_AUTO, - ATTR_OPERATION_MODE, ATTR_AWAY_MODE, SUPPORT_OPERATION_MODE, - SUPPORT_AWAY_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( - STATE_ON, STATE_OFF, ATTR_TEMPERATURE, CONF_NAME, ATTR_ENTITY_ID, - SERVICE_TURN_ON, SERVICE_TURN_OFF, STATE_UNKNOWN, PRECISION_HALVES, - PRECISION_TENTHS, PRECISION_WHOLE) + ATTR_ENTITY_ID, ATTR_TEMPERATURE, CONF_NAME, PRECISION_HALVES, + PRECISION_TENTHS, PRECISION_WHOLE, SERVICE_TURN_OFF, SERVICE_TURN_ON, + STATE_OFF, STATE_ON, STATE_UNKNOWN) +from homeassistant.core import DOMAIN as HA_DOMAIN, callback from homeassistant.helpers import condition +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.event import ( async_track_state_change, async_track_time_interval) -import homeassistant.helpers.config_validation as cv from homeassistant.helpers.restore_state import RestoreEntity +from . import PLATFORM_SCHEMA, ClimateDevice +from .const import ( + ATTR_AWAY_MODE, ATTR_OPERATION_MODE, STATE_AUTO, STATE_COOL, STATE_HEAT, + STATE_IDLE, SUPPORT_AWAY_MODE, SUPPORT_OPERATION_MODE, + SUPPORT_TARGET_TEMPERATURE) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['switch', 'sensor'] diff --git a/homeassistant/components/comfoconnect/fan.py b/homeassistant/components/comfoconnect/fan.py index a396dd276..88dcffcfd 100644 --- a/homeassistant/components/comfoconnect/fan.py +++ b/homeassistant/components/comfoconnect/fan.py @@ -1,12 +1,12 @@ """Platform to control a Zehnder ComfoAir Q350/450/600 ventilation unit.""" import logging -from homeassistant.components.comfoconnect import ( - DOMAIN, ComfoConnectBridge, SIGNAL_COMFOCONNECT_UPDATE_RECEIVED) from homeassistant.components.fan import ( - FanEntity, SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH, - SUPPORT_SET_SPEED) -from homeassistant.helpers.dispatcher import (dispatcher_connect) + SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SPEED_OFF, SUPPORT_SET_SPEED, + FanEntity) +from homeassistant.helpers.dispatcher import dispatcher_connect + +from . import DOMAIN, SIGNAL_COMFOCONNECT_UPDATE_RECEIVED, ComfoConnectBridge _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/comfoconnect/sensor.py b/homeassistant/components/comfoconnect/sensor.py index ac5de866c..edb96b8d2 100644 --- a/homeassistant/components/comfoconnect/sensor.py +++ b/homeassistant/components/comfoconnect/sensor.py @@ -1,15 +1,15 @@ """Platform to control a Zehnder ComfoAir Q350/450/600 ventilation unit.""" import logging -from homeassistant.components.comfoconnect import ( - DOMAIN, ComfoConnectBridge, ATTR_CURRENT_TEMPERATURE, - ATTR_CURRENT_HUMIDITY, ATTR_OUTSIDE_TEMPERATURE, - ATTR_OUTSIDE_HUMIDITY, ATTR_AIR_FLOW_SUPPLY, - ATTR_AIR_FLOW_EXHAUST, SIGNAL_COMFOCONNECT_UPDATE_RECEIVED) from homeassistant.const import CONF_RESOURCES, TEMP_CELSIUS from homeassistant.helpers.dispatcher import dispatcher_connect from homeassistant.helpers.entity import Entity +from . import ( + ATTR_AIR_FLOW_EXHAUST, ATTR_AIR_FLOW_SUPPLY, ATTR_CURRENT_HUMIDITY, + ATTR_CURRENT_TEMPERATURE, ATTR_OUTSIDE_HUMIDITY, ATTR_OUTSIDE_TEMPERATURE, + DOMAIN, SIGNAL_COMFOCONNECT_UPDATE_RECEIVED, ComfoConnectBridge) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['comfoconnect'] diff --git a/homeassistant/components/command_line/binary_sensor.py b/homeassistant/components/command_line/binary_sensor.py index af9b3d48d..21ee1312e 100644 --- a/homeassistant/components/command_line/binary_sensor.py +++ b/homeassistant/components/command_line/binary_sensor.py @@ -4,18 +4,19 @@ Support for custom shell commands to retrieve values. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/binary_sensor.command_line/ """ -import logging from datetime import timedelta +import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.binary_sensor import ( - BinarySensorDevice, DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA) -from homeassistant.components.command_line.sensor import CommandSensorData + DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import ( - CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, CONF_NAME, CONF_VALUE_TEMPLATE, - CONF_COMMAND, CONF_DEVICE_CLASS) + CONF_COMMAND, CONF_DEVICE_CLASS, CONF_NAME, CONF_PAYLOAD_OFF, + CONF_PAYLOAD_ON, CONF_VALUE_TEMPLATE) +import homeassistant.helpers.config_validation as cv + +from .sensor import CommandSensorData _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/config/automation.py b/homeassistant/components/config/automation.py index 47ac9d3a4..175d90ff5 100644 --- a/homeassistant/components/config/automation.py +++ b/homeassistant/components/config/automation.py @@ -2,11 +2,12 @@ from collections import OrderedDict import uuid -from homeassistant.components.config import EditIdBasedConfigView -from homeassistant.const import CONF_ID, SERVICE_RELOAD from homeassistant.components.automation import DOMAIN, PLATFORM_SCHEMA +from homeassistant.const import CONF_ID, SERVICE_RELOAD import homeassistant.helpers.config_validation as cv +from . import EditIdBasedConfigView + CONFIG_PATH = 'automations.yaml' diff --git a/homeassistant/components/config/customize.py b/homeassistant/components/config/customize.py index ec9d9d0ff..bb774ae7e 100644 --- a/homeassistant/components/config/customize.py +++ b/homeassistant/components/config/customize.py @@ -1,11 +1,11 @@ """Provide configuration end points for Customize.""" -from homeassistant.components.config import EditKeyBasedConfigView from homeassistant.components import SERVICE_RELOAD_CORE_CONFIG from homeassistant.config import DATA_CUSTOMIZE from homeassistant.core import DOMAIN - import homeassistant.helpers.config_validation as cv +from . import EditKeyBasedConfigView + CONFIG_PATH = 'customize.yaml' diff --git a/homeassistant/components/config/group.py b/homeassistant/components/config/group.py index f9b9a2c49..60421bcc1 100644 --- a/homeassistant/components/config/group.py +++ b/homeassistant/components/config/group.py @@ -1,9 +1,9 @@ """Provide configuration end points for Groups.""" -from homeassistant.const import SERVICE_RELOAD -from homeassistant.components.config import EditKeyBasedConfigView from homeassistant.components.group import DOMAIN, GROUP_SCHEMA +from homeassistant.const import SERVICE_RELOAD import homeassistant.helpers.config_validation as cv +from . import EditKeyBasedConfigView CONFIG_PATH = 'groups.yaml' diff --git a/homeassistant/components/config/script.py b/homeassistant/components/config/script.py index 640e267d0..c8a58e5d7 100644 --- a/homeassistant/components/config/script.py +++ b/homeassistant/components/config/script.py @@ -1,9 +1,9 @@ """Provide configuration end points for scripts.""" -from homeassistant.components.config import EditKeyBasedConfigView from homeassistant.components.script import DOMAIN, SCRIPT_ENTRY_SCHEMA from homeassistant.const import SERVICE_RELOAD import homeassistant.helpers.config_validation as cv +from . import EditKeyBasedConfigView CONFIG_PATH = 'scripts.yaml' diff --git a/homeassistant/components/config/zwave.py b/homeassistant/components/config/zwave.py index f29dde459..e7e399684 100644 --- a/homeassistant/components/config/zwave.py +++ b/homeassistant/components/config/zwave.py @@ -4,13 +4,14 @@ import logging from aiohttp.web import Response -from homeassistant.components.config import EditKeyBasedConfigView from homeassistant.components.http import HomeAssistantView from homeassistant.components.zwave import DEVICE_CONFIG_SCHEMA_ENTRY, const from homeassistant.const import HTTP_NOT_FOUND, HTTP_OK import homeassistant.core as ha import homeassistant.helpers.config_validation as cv +from . import EditKeyBasedConfigView + _LOGGER = logging.getLogger(__name__) CONFIG_PATH = 'zwave_device_config.yaml' OZW_LOG_FILENAME = 'OZW_Log.txt' diff --git a/homeassistant/components/conversation/__init__.py b/homeassistant/components/conversation/__init__.py index 7082cb367..bb2d692f2 100644 --- a/homeassistant/components/conversation/__init__.py +++ b/homeassistant/components/conversation/__init__.py @@ -6,17 +6,16 @@ import voluptuous as vol from homeassistant import core from homeassistant.components import http -from homeassistant.components.conversation.util import create_matcher -from homeassistant.components.http.data_validator import ( - RequestDataValidator) -from homeassistant.components.cover import (INTENT_OPEN_COVER, - INTENT_CLOSE_COVER) +from homeassistant.components.cover import ( + INTENT_CLOSE_COVER, INTENT_OPEN_COVER) +from homeassistant.components.http.data_validator import RequestDataValidator from homeassistant.const import EVENT_COMPONENT_LOADED from homeassistant.core import callback -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers import intent +from homeassistant.helpers import config_validation as cv, intent from homeassistant.loader import bind_hass -from homeassistant.setup import (ATTR_COMPONENT) +from homeassistant.setup import ATTR_COMPONENT + +from .util import create_matcher _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/cover/demo.py b/homeassistant/components/cover/demo.py index 21add0a6c..1f31cecc9 100644 --- a/homeassistant/components/cover/demo.py +++ b/homeassistant/components/cover/demo.py @@ -4,11 +4,12 @@ Demo platform for the cover component. For more details about this platform, please refer to the documentation https://home-assistant.io/components/demo/ """ -from homeassistant.components.cover import ( - CoverDevice, SUPPORT_OPEN, SUPPORT_CLOSE, ATTR_POSITION, - ATTR_TILT_POSITION) from homeassistant.helpers.event import track_utc_time_change +from . import ( + ATTR_POSITION, ATTR_TILT_POSITION, SUPPORT_CLOSE, SUPPORT_OPEN, + CoverDevice) + def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the Demo covers.""" diff --git a/homeassistant/components/cover/group.py b/homeassistant/components/cover/group.py index 0424c9007..aba57284d 100644 --- a/homeassistant/components/cover/group.py +++ b/homeassistant/components/cover/group.py @@ -8,22 +8,22 @@ import logging import voluptuous as vol -from homeassistant.core import callback -from homeassistant.components.cover import ( - DOMAIN, PLATFORM_SCHEMA, CoverDevice, ATTR_POSITION, - ATTR_CURRENT_POSITION, ATTR_TILT_POSITION, ATTR_CURRENT_TILT_POSITION, - SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_STOP, SUPPORT_SET_POSITION, - SUPPORT_OPEN_TILT, SUPPORT_CLOSE_TILT, - SUPPORT_STOP_TILT, SUPPORT_SET_TILT_POSITION, - SERVICE_OPEN_COVER, SERVICE_CLOSE_COVER, SERVICE_SET_COVER_POSITION, - SERVICE_STOP_COVER, SERVICE_OPEN_COVER_TILT, SERVICE_CLOSE_COVER_TILT, - SERVICE_STOP_COVER_TILT, SERVICE_SET_COVER_TILT_POSITION) from homeassistant.const import ( - ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, - CONF_ENTITIES, CONF_NAME, STATE_CLOSED) + ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, CONF_ENTITIES, + CONF_NAME, STATE_CLOSED) +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.event import async_track_state_change +from . import ( + ATTR_CURRENT_POSITION, ATTR_CURRENT_TILT_POSITION, ATTR_POSITION, + ATTR_TILT_POSITION, DOMAIN, PLATFORM_SCHEMA, SERVICE_CLOSE_COVER, + SERVICE_CLOSE_COVER_TILT, SERVICE_OPEN_COVER, SERVICE_OPEN_COVER_TILT, + SERVICE_SET_COVER_POSITION, SERVICE_SET_COVER_TILT_POSITION, + SERVICE_STOP_COVER, SERVICE_STOP_COVER_TILT, SUPPORT_CLOSE, + SUPPORT_CLOSE_TILT, SUPPORT_OPEN, SUPPORT_OPEN_TILT, SUPPORT_SET_POSITION, + SUPPORT_SET_TILT_POSITION, SUPPORT_STOP, SUPPORT_STOP_TILT, CoverDevice) + _LOGGER = logging.getLogger(__name__) KEY_OPEN_CLOSE = 'open_close' diff --git a/homeassistant/components/daikin/climate.py b/homeassistant/components/daikin/climate.py index 869c38869..c42f27855 100644 --- a/homeassistant/components/daikin/climate.py +++ b/homeassistant/components/daikin/climate.py @@ -4,19 +4,20 @@ import re import voluptuous as vol -from homeassistant.components.climate import ClimateDevice, PLATFORM_SCHEMA +from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice from homeassistant.components.climate.const import ( ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, ATTR_OPERATION_MODE, - ATTR_SWING_MODE, STATE_AUTO, STATE_COOL, STATE_DRY, - STATE_FAN_ONLY, STATE_HEAT, SUPPORT_FAN_MODE, - SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.daikin import DOMAIN as DAIKIN_DOMAIN -from homeassistant.components.daikin.const import ( - ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, ATTR_TARGET_TEMPERATURE) + ATTR_SWING_MODE, STATE_AUTO, STATE_COOL, STATE_DRY, STATE_FAN_ONLY, + STATE_HEAT, SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE, + SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( ATTR_TEMPERATURE, CONF_HOST, CONF_NAME, STATE_OFF, TEMP_CELSIUS) import homeassistant.helpers.config_validation as cv +from . import DOMAIN as DAIKIN_DOMAIN +from .const import ( + ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, ATTR_TARGET_TEMPERATURE) + _LOGGER = logging.getLogger(__name__) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ diff --git a/homeassistant/components/daikin/sensor.py b/homeassistant/components/daikin/sensor.py index 3669dfac2..5a005e299 100644 --- a/homeassistant/components/daikin/sensor.py +++ b/homeassistant/components/daikin/sensor.py @@ -1,14 +1,15 @@ """Support for Daikin AC sensors.""" import logging -from homeassistant.components.daikin import DOMAIN as DAIKIN_DOMAIN -from homeassistant.components.daikin.const import ( - ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, SENSOR_TYPE_TEMPERATURE, - SENSOR_TYPES) from homeassistant.const import CONF_ICON, CONF_NAME, CONF_TYPE from homeassistant.helpers.entity import Entity from homeassistant.util.unit_system import UnitSystem +from . import DOMAIN as DAIKIN_DOMAIN +from .const import ( + ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, SENSOR_TYPE_TEMPERATURE, + SENSOR_TYPES) + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/danfoss_air/binary_sensor.py b/homeassistant/components/danfoss_air/binary_sensor.py index 4052a1005..723b0d088 100644 --- a/homeassistant/components/danfoss_air/binary_sensor.py +++ b/homeassistant/components/danfoss_air/binary_sensor.py @@ -1,7 +1,7 @@ """Support for the for Danfoss Air HRV binary sensors.""" from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.danfoss_air import DOMAIN \ - as DANFOSS_AIR_DOMAIN + +from . import DOMAIN as DANFOSS_AIR_DOMAIN def setup_platform(hass, config, add_entities, discovery_info=None): diff --git a/homeassistant/components/danfoss_air/sensor.py b/homeassistant/components/danfoss_air/sensor.py index 9902184e6..a5dc2a2eb 100644 --- a/homeassistant/components/danfoss_air/sensor.py +++ b/homeassistant/components/danfoss_air/sensor.py @@ -1,13 +1,13 @@ """Support for the for Danfoss Air HRV sensors.""" import logging -from homeassistant.components.danfoss_air import DOMAIN \ - as DANFOSS_AIR_DOMAIN from homeassistant.const import ( - TEMP_CELSIUS, DEVICE_CLASS_BATTERY, - DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY) + DEVICE_CLASS_BATTERY, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, + TEMP_CELSIUS) from homeassistant.helpers.entity import Entity +from . import DOMAIN as DANFOSS_AIR_DOMAIN + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/danfoss_air/switch.py b/homeassistant/components/danfoss_air/switch.py index ec85757be..f5a7fd47f 100644 --- a/homeassistant/components/danfoss_air/switch.py +++ b/homeassistant/components/danfoss_air/switch.py @@ -1,10 +1,9 @@ """Support for the for Danfoss Air HRV sswitches.""" import logging -from homeassistant.components.switch import ( - SwitchDevice) -from homeassistant.components.danfoss_air import DOMAIN \ - as DANFOSS_AIR_DOMAIN +from homeassistant.components.switch import SwitchDevice + +from . import DOMAIN as DANFOSS_AIR_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/deconz/const.py b/homeassistant/components/deconz/const.py index bf0799d1f..e728430f2 100644 --- a/homeassistant/components/deconz/const.py +++ b/homeassistant/components/deconz/const.py @@ -1,7 +1,7 @@ """Constants for the deCONZ component.""" import logging -_LOGGER = logging.getLogger('homeassistant.components.deconz') +_LOGGER = logging.getLogger('.') DOMAIN = 'deconz' diff --git a/homeassistant/components/digital_ocean/binary_sensor.py b/homeassistant/components/digital_ocean/binary_sensor.py index 88df56cc6..d496a0916 100644 --- a/homeassistant/components/digital_ocean/binary_sensor.py +++ b/homeassistant/components/digital_ocean/binary_sensor.py @@ -3,14 +3,15 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) -from homeassistant.components.digital_ocean import ( - CONF_DROPLETS, ATTR_CREATED_AT, ATTR_DROPLET_ID, ATTR_DROPLET_NAME, - ATTR_FEATURES, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, - ATTR_REGION, ATTR_VCPUS, ATTRIBUTION, DATA_DIGITAL_OCEAN) + PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import ATTR_ATTRIBUTION +import homeassistant.helpers.config_validation as cv + +from . import ( + ATTR_CREATED_AT, ATTR_DROPLET_ID, ATTR_DROPLET_NAME, ATTR_FEATURES, + ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, ATTR_REGION, ATTR_VCPUS, + ATTRIBUTION, CONF_DROPLETS, DATA_DIGITAL_OCEAN) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/digital_ocean/switch.py b/homeassistant/components/digital_ocean/switch.py index 9b5ddda34..bc4a6a29b 100644 --- a/homeassistant/components/digital_ocean/switch.py +++ b/homeassistant/components/digital_ocean/switch.py @@ -3,13 +3,14 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA) -from homeassistant.components.digital_ocean import ( - CONF_DROPLETS, ATTR_CREATED_AT, ATTR_DROPLET_ID, ATTR_DROPLET_NAME, - ATTR_FEATURES, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, - ATTR_REGION, ATTR_VCPUS, ATTRIBUTION, DATA_DIGITAL_OCEAN) +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import ATTR_ATTRIBUTION +import homeassistant.helpers.config_validation as cv + +from . import ( + ATTR_CREATED_AT, ATTR_DROPLET_ID, ATTR_DROPLET_NAME, ATTR_FEATURES, + ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, ATTR_REGION, ATTR_VCPUS, + ATTRIBUTION, CONF_DROPLETS, DATA_DIGITAL_OCEAN) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/doorbird/camera.py b/homeassistant/components/doorbird/camera.py index e201837aa..272a3cb93 100644 --- a/homeassistant/components/doorbird/camera.py +++ b/homeassistant/components/doorbird/camera.py @@ -7,9 +7,10 @@ import aiohttp import async_timeout from homeassistant.components.camera import Camera -from homeassistant.components.doorbird import DOMAIN as DOORBIRD_DOMAIN from homeassistant.helpers.aiohttp_client import async_get_clientsession +from . import DOMAIN as DOORBIRD_DOMAIN + DEPENDENCIES = ['doorbird'] _CAMERA_LAST_VISITOR = "{} Last Ring" diff --git a/homeassistant/components/doorbird/switch.py b/homeassistant/components/doorbird/switch.py index 376713d4b..ba6f96660 100644 --- a/homeassistant/components/doorbird/switch.py +++ b/homeassistant/components/doorbird/switch.py @@ -2,9 +2,10 @@ import datetime import logging -from homeassistant.components.doorbird import DOMAIN as DOORBIRD_DOMAIN from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as DOORBIRD_DOMAIN + DEPENDENCIES = ['doorbird'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/dovado/notify.py b/homeassistant/components/dovado/notify.py index ea6ba2b45..59827529e 100644 --- a/homeassistant/components/dovado/notify.py +++ b/homeassistant/components/dovado/notify.py @@ -1,9 +1,10 @@ """Support for SMS notifications from the Dovado router.""" import logging -from homeassistant.components.dovado import DOMAIN as DOVADO_DOMAIN -from homeassistant.components.notify import BaseNotificationService, \ - ATTR_TARGET +from homeassistant.components.notify import ( + ATTR_TARGET, BaseNotificationService) + +from . import DOMAIN as DOVADO_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/dovado/sensor.py b/homeassistant/components/dovado/sensor.py index eb0016ed2..56c4ee03a 100644 --- a/homeassistant/components/dovado/sensor.py +++ b/homeassistant/components/dovado/sensor.py @@ -1,16 +1,17 @@ """Support for sensors from the Dovado router.""" +from datetime import timedelta import logging import re -from datetime import timedelta import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.dovado import DOMAIN as DOVADO_DOMAIN from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_SENSORS +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import DOMAIN as DOVADO_DOMAIN + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['dovado'] diff --git a/homeassistant/components/dyson/climate.py b/homeassistant/components/dyson/climate.py index 09196a82b..3e5c976b1 100644 --- a/homeassistant/components/dyson/climate.py +++ b/homeassistant/components/dyson/climate.py @@ -6,12 +6,13 @@ https://home-assistant.io/components/climate.dyson/ """ import logging -from homeassistant.components.dyson import DYSON_DEVICES from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_HEAT, STATE_COOL, STATE_IDLE, - SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE) -from homeassistant.const import TEMP_CELSIUS, ATTR_TEMPERATURE + STATE_COOL, STATE_HEAT, STATE_IDLE, SUPPORT_FAN_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) +from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS + +from . import DYSON_DEVICES _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/dyson/fan.py b/homeassistant/components/dyson/fan.py index ef5170211..743d301df 100644 --- a/homeassistant/components/dyson/fan.py +++ b/homeassistant/components/dyson/fan.py @@ -7,11 +7,12 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.dyson import DYSON_DEVICES from homeassistant.components.fan import ( DOMAIN, SUPPORT_OSCILLATE, SUPPORT_SET_SPEED, FanEntity) from homeassistant.const import CONF_ENTITY_ID +import homeassistant.helpers.config_validation as cv + +from . import DYSON_DEVICES _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/dyson/sensor.py b/homeassistant/components/dyson/sensor.py index 53913d47b..ed8987f75 100644 --- a/homeassistant/components/dyson/sensor.py +++ b/homeassistant/components/dyson/sensor.py @@ -6,10 +6,11 @@ https://home-assistant.io/components/sensor.dyson/ """ import logging -from homeassistant.components.dyson import DYSON_DEVICES from homeassistant.const import STATE_OFF, TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import DYSON_DEVICES + DEPENDENCIES = ['dyson'] SENSOR_UNITS = { diff --git a/homeassistant/components/dyson/vacuum.py b/homeassistant/components/dyson/vacuum.py index 3d6e23c20..7902cfa15 100644 --- a/homeassistant/components/dyson/vacuum.py +++ b/homeassistant/components/dyson/vacuum.py @@ -6,13 +6,14 @@ https://home-assistant.io/components/vacuum.dyson/ """ import logging -from homeassistant.components.dyson import DYSON_DEVICES from homeassistant.components.vacuum import ( SUPPORT_BATTERY, SUPPORT_FAN_SPEED, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, VacuumDevice) from homeassistant.helpers.icon import icon_for_battery_level +from . import DYSON_DEVICES + _LOGGER = logging.getLogger(__name__) ATTR_CLEAN_ID = 'clean_id' diff --git a/homeassistant/components/ecoal_boiler/sensor.py b/homeassistant/components/ecoal_boiler/sensor.py index 47ed2d6eb..ef8b39842 100644 --- a/homeassistant/components/ecoal_boiler/sensor.py +++ b/homeassistant/components/ecoal_boiler/sensor.py @@ -1,11 +1,11 @@ """Allows reading temperatures from ecoal/esterownik.pl controller.""" import logging -from homeassistant.components.ecoal_boiler import ( - DATA_ECOAL_BOILER, AVAILABLE_SENSORS, ) from homeassistant.const import TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import AVAILABLE_SENSORS, DATA_ECOAL_BOILER + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['ecoal_boiler'] diff --git a/homeassistant/components/ecoal_boiler/switch.py b/homeassistant/components/ecoal_boiler/switch.py index f11312519..db8759a03 100644 --- a/homeassistant/components/ecoal_boiler/switch.py +++ b/homeassistant/components/ecoal_boiler/switch.py @@ -3,8 +3,8 @@ import logging from typing import Optional from homeassistant.components.switch import SwitchDevice -from homeassistant.components.ecoal_boiler import ( - DATA_ECOAL_BOILER, AVAILABLE_PUMPS, ) + +from . import AVAILABLE_PUMPS, DATA_ECOAL_BOILER _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ecovacs/vacuum.py b/homeassistant/components/ecovacs/vacuum.py index 9d2af7303..b9fe94f2b 100644 --- a/homeassistant/components/ecovacs/vacuum.py +++ b/homeassistant/components/ecovacs/vacuum.py @@ -2,13 +2,13 @@ import logging from homeassistant.components.vacuum import ( - VacuumDevice, SUPPORT_BATTERY, SUPPORT_RETURN_HOME, SUPPORT_CLEAN_SPOT, - SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, - SUPPORT_LOCATE, SUPPORT_FAN_SPEED, SUPPORT_SEND_COMMAND, ) -from homeassistant.components.ecovacs import ( - ECOVACS_DEVICES) + SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED, SUPPORT_LOCATE, + SUPPORT_RETURN_HOME, SUPPORT_SEND_COMMAND, SUPPORT_STATUS, SUPPORT_STOP, + SUPPORT_TURN_OFF, SUPPORT_TURN_ON, VacuumDevice) from homeassistant.helpers.icon import icon_for_battery_level +from . import ECOVACS_DEVICES + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['ecovacs'] diff --git a/homeassistant/components/edp_redy/sensor.py b/homeassistant/components/edp_redy/sensor.py index 389ae77f3..b8f9c031c 100644 --- a/homeassistant/components/edp_redy/sensor.py +++ b/homeassistant/components/edp_redy/sensor.py @@ -1,10 +1,10 @@ """Support for EDP re:dy sensors.""" import logging -from homeassistant.helpers.entity import Entity from homeassistant.const import POWER_WATT +from homeassistant.helpers.entity import Entity -from homeassistant.components.edp_redy import EdpRedyDevice, EDP_REDY +from . import EDP_REDY, EdpRedyDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/edp_redy/switch.py b/homeassistant/components/edp_redy/switch.py index ad4ce8fe7..0c92f80cc 100644 --- a/homeassistant/components/edp_redy/switch.py +++ b/homeassistant/components/edp_redy/switch.py @@ -1,9 +1,10 @@ """Support for EDP re:dy plugs/switches.""" import logging -from homeassistant.components.edp_redy import EdpRedyDevice, EDP_REDY from homeassistant.components.switch import SwitchDevice +from . import EDP_REDY, EdpRedyDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['edp_redy'] diff --git a/homeassistant/components/egardia/alarm_control_panel.py b/homeassistant/components/egardia/alarm_control_panel.py index e202a46f9..7fc60d5fb 100644 --- a/homeassistant/components/egardia/alarm_control_panel.py +++ b/homeassistant/components/egardia/alarm_control_panel.py @@ -4,14 +4,15 @@ import logging import requests import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.egardia import ( - CONF_REPORT_SERVER_CODES, CONF_REPORT_SERVER_ENABLED, - CONF_REPORT_SERVER_PORT, EGARDIA_DEVICE, EGARDIA_SERVER, - REPORT_SERVER_CODES_IGNORE) from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED) +from . import ( + CONF_REPORT_SERVER_CODES, CONF_REPORT_SERVER_ENABLED, + CONF_REPORT_SERVER_PORT, EGARDIA_DEVICE, EGARDIA_SERVER, + REPORT_SERVER_CODES_IGNORE) + DEPENDENCIES = ['egardia'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/egardia/binary_sensor.py b/homeassistant/components/egardia/binary_sensor.py index 74a048a86..d11894ae6 100644 --- a/homeassistant/components/egardia/binary_sensor.py +++ b/homeassistant/components/egardia/binary_sensor.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.egardia import ( - ATTR_DISCOVER_DEVICES, EGARDIA_DEVICE) from homeassistant.const import STATE_OFF, STATE_ON +from . import ATTR_DISCOVER_DEVICES, EGARDIA_DEVICE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['egardia'] diff --git a/homeassistant/components/eight_sleep/binary_sensor.py b/homeassistant/components/eight_sleep/binary_sensor.py index 2a9cb19a3..a3ca27b57 100644 --- a/homeassistant/components/eight_sleep/binary_sensor.py +++ b/homeassistant/components/eight_sleep/binary_sensor.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.eight_sleep import ( - DATA_EIGHT, EightSleepHeatEntity, CONF_BINARY_SENSORS, NAME_MAP) + +from . import CONF_BINARY_SENSORS, DATA_EIGHT, NAME_MAP, EightSleepHeatEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/eight_sleep/sensor.py b/homeassistant/components/eight_sleep/sensor.py index 2bb03c8d4..a1ad93ec5 100644 --- a/homeassistant/components/eight_sleep/sensor.py +++ b/homeassistant/components/eight_sleep/sensor.py @@ -1,9 +1,9 @@ """Support for Eight Sleep sensors.""" import logging -from homeassistant.components.eight_sleep import ( - DATA_EIGHT, EightSleepHeatEntity, EightSleepUserEntity, - CONF_SENSORS, NAME_MAP) +from . import ( + CONF_SENSORS, DATA_EIGHT, NAME_MAP, EightSleepHeatEntity, + EightSleepUserEntity) DEPENDENCIES = ['eight_sleep'] diff --git a/homeassistant/components/elkm1/alarm_control_panel.py b/homeassistant/components/elkm1/alarm_control_panel.py index 63b38c1d3..e9155dd17 100644 --- a/homeassistant/components/elkm1/alarm_control_panel.py +++ b/homeassistant/components/elkm1/alarm_control_panel.py @@ -1,16 +1,17 @@ """Each ElkM1 area will be created as a separate alarm_control_panel.""" import voluptuous as vol + import homeassistant.components.alarm_control_panel as alarm from homeassistant.const import ( ATTR_CODE, ATTR_ENTITY_ID, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_ARMING, STATE_ALARM_DISARMED, STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED) -from homeassistant.components.elkm1 import ( - DOMAIN as ELK_DOMAIN, create_elk_entities, ElkEntity) import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import ( async_dispatcher_connect, async_dispatcher_send) +from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities + DEPENDENCIES = [ELK_DOMAIN] SIGNAL_ARM_ENTITY = 'elkm1_arm' diff --git a/homeassistant/components/elkm1/climate.py b/homeassistant/components/elkm1/climate.py index 72f93b541..93e4aa66b 100644 --- a/homeassistant/components/elkm1/climate.py +++ b/homeassistant/components/elkm1/climate.py @@ -1,14 +1,13 @@ """Support for control of Elk-M1 connected thermostats.""" from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, STATE_AUTO, - STATE_COOL, STATE_FAN_ONLY, STATE_HEAT, STATE_IDLE, SUPPORT_AUX_HEAT, - SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE_HIGH, + ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, STATE_AUTO, STATE_COOL, + STATE_FAN_ONLY, STATE_HEAT, STATE_IDLE, SUPPORT_AUX_HEAT, SUPPORT_FAN_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW) -from homeassistant.components.elkm1 import ( - DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities) -from homeassistant.const import ( - STATE_ON, PRECISION_WHOLE) +from homeassistant.const import PRECISION_WHOLE, STATE_ON + +from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities DEPENDENCIES = [ELK_DOMAIN] diff --git a/homeassistant/components/elkm1/light.py b/homeassistant/components/elkm1/light.py index 3a282595d..fe84ab3f2 100644 --- a/homeassistant/components/elkm1/light.py +++ b/homeassistant/components/elkm1/light.py @@ -1,8 +1,8 @@ """Support for control of ElkM1 lighting (X10, UPB, etc).""" from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) -from homeassistant.components.elkm1 import ( - DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities) + +from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities DEPENDENCIES = [ELK_DOMAIN] diff --git a/homeassistant/components/elkm1/scene.py b/homeassistant/components/elkm1/scene.py index c8583b1d8..1d08f4cf9 100644 --- a/homeassistant/components/elkm1/scene.py +++ b/homeassistant/components/elkm1/scene.py @@ -1,8 +1,8 @@ """Support for control of ElkM1 tasks ("macros").""" -from homeassistant.components.elkm1 import ( - DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities) from homeassistant.components.scene import Scene +from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities + DEPENDENCIES = [ELK_DOMAIN] diff --git a/homeassistant/components/elkm1/sensor.py b/homeassistant/components/elkm1/sensor.py index 63da6ea53..da27a3ac4 100644 --- a/homeassistant/components/elkm1/sensor.py +++ b/homeassistant/components/elkm1/sensor.py @@ -1,6 +1,5 @@ """Support for control of ElkM1 sensors.""" -from homeassistant.components.elkm1 import ( - DOMAIN as ELK_DOMAIN, create_elk_entities, ElkEntity) +from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities DEPENDENCIES = [ELK_DOMAIN] diff --git a/homeassistant/components/elkm1/switch.py b/homeassistant/components/elkm1/switch.py index 7badd6ee5..740a29658 100644 --- a/homeassistant/components/elkm1/switch.py +++ b/homeassistant/components/elkm1/switch.py @@ -1,8 +1,8 @@ """Support for control of ElkM1 outputs (relays).""" -from homeassistant.components.elkm1 import ( - DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities) from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities + DEPENDENCIES = [ELK_DOMAIN] diff --git a/homeassistant/components/emulated_roku/binding.py b/homeassistant/components/emulated_roku/binding.py index cd4256028..9dfb58a5e 100644 --- a/homeassistant/components/emulated_roku/binding.py +++ b/homeassistant/components/emulated_roku/binding.py @@ -5,7 +5,7 @@ from homeassistant.const import ( EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP) from homeassistant.core import CoreState, EventOrigin -LOGGER = logging.getLogger('homeassistant.components.emulated_roku') +LOGGER = logging.getLogger('.') EVENT_ROKU_COMMAND = 'roku_command' diff --git a/homeassistant/components/envisalink/alarm_control_panel.py b/homeassistant/components/envisalink/alarm_control_panel.py index a4cc5864f..44874c6d5 100644 --- a/homeassistant/components/envisalink/alarm_control_panel.py +++ b/homeassistant/components/envisalink/alarm_control_panel.py @@ -3,16 +3,18 @@ import logging import voluptuous as vol -from homeassistant.core import callback -from homeassistant.helpers.dispatcher import async_dispatcher_connect import homeassistant.components.alarm_control_panel as alarm -import homeassistant.helpers.config_validation as cv -from homeassistant.components.envisalink import ( - DATA_EVL, EnvisalinkDevice, PARTITION_SCHEMA, CONF_CODE, CONF_PANIC, - CONF_PARTITIONNAME, SIGNAL_KEYPAD_UPDATE, SIGNAL_PARTITION_UPDATE) from homeassistant.const import ( - STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, - STATE_UNKNOWN, STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING, ATTR_ENTITY_ID) + ATTR_ENTITY_ID, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, + STATE_ALARM_DISARMED, STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, + STATE_UNKNOWN) +from homeassistant.core import callback +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ( + CONF_CODE, CONF_PANIC, CONF_PARTITIONNAME, DATA_EVL, PARTITION_SCHEMA, + SIGNAL_KEYPAD_UPDATE, SIGNAL_PARTITION_UPDATE, EnvisalinkDevice) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/envisalink/binary_sensor.py b/homeassistant/components/envisalink/binary_sensor.py index 26b54e16c..267bba8cd 100644 --- a/homeassistant/components/envisalink/binary_sensor.py +++ b/homeassistant/components/envisalink/binary_sensor.py @@ -1,16 +1,17 @@ """Support for Envisalink zone states- represented as binary sensors.""" -import logging import datetime +import logging +from homeassistant.components.binary_sensor import BinarySensorDevice +from homeassistant.const import ATTR_LAST_TRIP_TIME from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect -from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.envisalink import ( - DATA_EVL, ZONE_SCHEMA, CONF_ZONENAME, CONF_ZONETYPE, EnvisalinkDevice, - SIGNAL_ZONE_UPDATE) -from homeassistant.const import ATTR_LAST_TRIP_TIME from homeassistant.util import dt as dt_util +from . import ( + CONF_ZONENAME, CONF_ZONETYPE, DATA_EVL, SIGNAL_ZONE_UPDATE, ZONE_SCHEMA, + EnvisalinkDevice) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['envisalink'] diff --git a/homeassistant/components/envisalink/sensor.py b/homeassistant/components/envisalink/sensor.py index cc6a8b872..67a601b02 100644 --- a/homeassistant/components/envisalink/sensor.py +++ b/homeassistant/components/envisalink/sensor.py @@ -3,11 +3,12 @@ import logging from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect -from homeassistant.components.envisalink import ( - DATA_EVL, PARTITION_SCHEMA, CONF_PARTITIONNAME, EnvisalinkDevice, - SIGNAL_KEYPAD_UPDATE, SIGNAL_PARTITION_UPDATE) from homeassistant.helpers.entity import Entity +from . import ( + CONF_PARTITIONNAME, DATA_EVL, PARTITION_SCHEMA, SIGNAL_KEYPAD_UPDATE, + SIGNAL_PARTITION_UPDATE, EnvisalinkDevice) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['envisalink'] diff --git a/homeassistant/components/esphome/binary_sensor.py b/homeassistant/components/esphome/binary_sensor.py index 4796df636..2db2f209f 100644 --- a/homeassistant/components/esphome/binary_sensor.py +++ b/homeassistant/components/esphome/binary_sensor.py @@ -1,11 +1,10 @@ """Support for ESPHome binary sensors.""" import logging - from typing import TYPE_CHECKING, Optional from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.esphome import EsphomeEntity, \ - platform_async_setup_entry + +from . import EsphomeEntity, platform_async_setup_entry if TYPE_CHECKING: # pylint: disable=unused-import diff --git a/homeassistant/components/esphome/cover.py b/homeassistant/components/esphome/cover.py index 14fce3fb4..d86c40e62 100644 --- a/homeassistant/components/esphome/cover.py +++ b/homeassistant/components/esphome/cover.py @@ -1,15 +1,14 @@ """Support for ESPHome covers.""" import logging - from typing import TYPE_CHECKING, Optional -from homeassistant.components.cover import CoverDevice, SUPPORT_CLOSE, \ - SUPPORT_OPEN, SUPPORT_STOP -from homeassistant.components.esphome import EsphomeEntity, \ - platform_async_setup_entry +from homeassistant.components.cover import ( + SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_STOP, CoverDevice) from homeassistant.config_entries import ConfigEntry from homeassistant.helpers.typing import HomeAssistantType +from . import EsphomeEntity, platform_async_setup_entry + if TYPE_CHECKING: # pylint: disable=unused-import from aioesphomeapi import CoverInfo, CoverState # noqa diff --git a/homeassistant/components/esphome/fan.py b/homeassistant/components/esphome/fan.py index 49e240154..05f18cb01 100644 --- a/homeassistant/components/esphome/fan.py +++ b/homeassistant/components/esphome/fan.py @@ -1,14 +1,15 @@ """Support for ESPHome fans.""" import logging -from typing import List, Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, List, Optional -from homeassistant.components.esphome import EsphomeEntity, \ - platform_async_setup_entry -from homeassistant.components.fan import FanEntity, SPEED_HIGH, SPEED_LOW, \ - SPEED_MEDIUM, SUPPORT_OSCILLATE, SUPPORT_SET_SPEED, SPEED_OFF +from homeassistant.components.fan import ( + SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SPEED_OFF, SUPPORT_OSCILLATE, + SUPPORT_SET_SPEED, FanEntity) from homeassistant.config_entries import ConfigEntry from homeassistant.helpers.typing import HomeAssistantType +from . import EsphomeEntity, platform_async_setup_entry + if TYPE_CHECKING: # pylint: disable=unused-import from aioesphomeapi import FanInfo, FanState # noqa diff --git a/homeassistant/components/esphome/light.py b/homeassistant/components/esphome/light.py index 3b0889ede..c84c50010 100644 --- a/homeassistant/components/esphome/light.py +++ b/homeassistant/components/esphome/light.py @@ -1,18 +1,18 @@ """Support for ESPHome lights.""" import logging -from typing import Optional, List, Tuple, TYPE_CHECKING +from typing import TYPE_CHECKING, List, Optional, Tuple -from homeassistant.components.esphome import EsphomeEntity, \ - platform_async_setup_entry -from homeassistant.components.light import Light, SUPPORT_FLASH, \ - SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION, SUPPORT_COLOR, \ - SUPPORT_WHITE_VALUE, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, ATTR_HS_COLOR, \ - ATTR_FLASH, ATTR_TRANSITION, ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, \ - ATTR_EFFECT, ATTR_WHITE_VALUE, FLASH_SHORT, FLASH_LONG +from homeassistant.components.light import ( + ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_FLASH, ATTR_HS_COLOR, + ATTR_TRANSITION, ATTR_WHITE_VALUE, FLASH_LONG, FLASH_SHORT, + SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, + SUPPORT_FLASH, SUPPORT_TRANSITION, SUPPORT_WHITE_VALUE, Light) from homeassistant.config_entries import ConfigEntry from homeassistant.helpers.typing import HomeAssistantType import homeassistant.util.color as color_util +from . import EsphomeEntity, platform_async_setup_entry + if TYPE_CHECKING: # pylint: disable=unused-import from aioesphomeapi import LightInfo, LightState # noqa diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py index f776ea468..e4fb7ef82 100644 --- a/homeassistant/components/esphome/sensor.py +++ b/homeassistant/components/esphome/sensor.py @@ -1,13 +1,13 @@ """Support for esphome sensors.""" import logging import math -from typing import Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, Optional -from homeassistant.components.esphome import EsphomeEntity, \ - platform_async_setup_entry from homeassistant.config_entries import ConfigEntry from homeassistant.helpers.typing import HomeAssistantType +from . import EsphomeEntity, platform_async_setup_entry + if TYPE_CHECKING: # pylint: disable=unused-import from aioesphomeapi import ( # noqa diff --git a/homeassistant/components/esphome/switch.py b/homeassistant/components/esphome/switch.py index 4bf4b416b..e5a9d0cf4 100644 --- a/homeassistant/components/esphome/switch.py +++ b/homeassistant/components/esphome/switch.py @@ -1,14 +1,13 @@ """Support for ESPHome switches.""" import logging - from typing import TYPE_CHECKING, Optional -from homeassistant.components.esphome import EsphomeEntity, \ - platform_async_setup_entry from homeassistant.components.switch import SwitchDevice from homeassistant.config_entries import ConfigEntry from homeassistant.helpers.typing import HomeAssistantType +from . import EsphomeEntity, platform_async_setup_entry + if TYPE_CHECKING: # pylint: disable=unused-import from aioesphomeapi import SwitchInfo, SwitchState # noqa diff --git a/homeassistant/components/evohome/climate.py b/homeassistant/components/evohome/climate.py index 955b82e37..eea34e070 100644 --- a/homeassistant/components/evohome/climate.py +++ b/homeassistant/components/evohome/climate.py @@ -6,30 +6,18 @@ from requests.exceptions import HTTPError from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_AUTO, STATE_ECO, STATE_MANUAL, - SUPPORT_AWAY_MODE, - SUPPORT_ON_OFF, - SUPPORT_OPERATION_MODE, - SUPPORT_TARGET_TEMPERATURE, -) -from homeassistant.components.evohome import ( - DATA_EVOHOME, DISPATCHER_EVOHOME, - CONF_LOCATION_IDX, SCAN_INTERVAL_DEFAULT, - EVO_PARENT, EVO_CHILD, - GWS, TCS, -) + STATE_AUTO, STATE_ECO, STATE_MANUAL, SUPPORT_AWAY_MODE, SUPPORT_ON_OFF, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( - CONF_SCAN_INTERVAL, - HTTP_TOO_MANY_REQUESTS, - PRECISION_HALVES, - STATE_OFF, - TEMP_CELSIUS -) + CONF_SCAN_INTERVAL, HTTP_TOO_MANY_REQUESTS, PRECISION_HALVES, STATE_OFF, + TEMP_CELSIUS) from homeassistant.core import callback from homeassistant.helpers.dispatcher import ( - dispatcher_send, - async_dispatcher_connect -) + async_dispatcher_connect, dispatcher_send) + +from . import ( + CONF_LOCATION_IDX, DATA_EVOHOME, DISPATCHER_EVOHOME, EVO_CHILD, EVO_PARENT, + GWS, SCAN_INTERVAL_DEFAULT, TCS) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/fan/demo.py b/homeassistant/components/fan/demo.py index 840196c8b..e67fbef65 100644 --- a/homeassistant/components/fan/demo.py +++ b/homeassistant/components/fan/demo.py @@ -4,11 +4,12 @@ Demo fan platform that has a fake fan. For more details about this platform, please refer to the documentation https://home-assistant.io/components/demo/ """ -from homeassistant.components.fan import (SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH, - FanEntity, SUPPORT_SET_SPEED, - SUPPORT_OSCILLATE, SUPPORT_DIRECTION) from homeassistant.const import STATE_OFF +from . import ( + SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SUPPORT_DIRECTION, SUPPORT_OSCILLATE, + SUPPORT_SET_SPEED, FanEntity) + FULL_SUPPORT = SUPPORT_SET_SPEED | SUPPORT_OSCILLATE | SUPPORT_DIRECTION LIMITED_SUPPORT = SUPPORT_SET_SPEED diff --git a/homeassistant/components/fastdotcom/sensor.py b/homeassistant/components/fastdotcom/sensor.py index 0f17179f9..37fc0815d 100644 --- a/homeassistant/components/fastdotcom/sensor.py +++ b/homeassistant/components/fastdotcom/sensor.py @@ -1,12 +1,12 @@ """Support for Fast.com internet speed testing sensor.""" import logging -from homeassistant.components.fastdotcom import DOMAIN as FASTDOTCOM_DOMAIN, \ - DATA_UPDATED from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.restore_state import RestoreEntity +from . import DATA_UPDATED, DOMAIN as FASTDOTCOM_DOMAIN + DEPENDENCIES = ['fastdotcom'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ffmpeg/camera.py b/homeassistant/components/ffmpeg/camera.py index db9e73f3e..4272a3d60 100644 --- a/homeassistant/components/ffmpeg/camera.py +++ b/homeassistant/components/ffmpeg/camera.py @@ -9,13 +9,12 @@ import logging import voluptuous as vol +from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.const import CONF_NAME -from homeassistant.components.camera import Camera, PLATFORM_SCHEMA -from homeassistant.components.ffmpeg import ( - DATA_FFMPEG, CONF_INPUT, CONF_EXTRA_ARGUMENTS) +from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream import homeassistant.helpers.config_validation as cv -from homeassistant.helpers.aiohttp_client import ( - async_aiohttp_proxy_stream) + +from . import CONF_EXTRA_ARGUMENTS, CONF_INPUT, DATA_FFMPEG _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/fibaro/binary_sensor.py b/homeassistant/components/fibaro/binary_sensor.py index 2c2d9c30a..f71a5f366 100644 --- a/homeassistant/components/fibaro/binary_sensor.py +++ b/homeassistant/components/fibaro/binary_sensor.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.binary_sensor import ( - BinarySensorDevice, ENTITY_ID_FORMAT) -from homeassistant.components.fibaro import ( - FIBARO_DEVICES, FibaroDevice) -from homeassistant.const import (CONF_DEVICE_CLASS, CONF_ICON) + ENTITY_ID_FORMAT, BinarySensorDevice) +from homeassistant.const import CONF_DEVICE_CLASS, CONF_ICON + +from . import FIBARO_DEVICES, FibaroDevice DEPENDENCIES = ['fibaro'] diff --git a/homeassistant/components/fibaro/cover.py b/homeassistant/components/fibaro/cover.py index aa34fcc36..0f5cc32bc 100644 --- a/homeassistant/components/fibaro/cover.py +++ b/homeassistant/components/fibaro/cover.py @@ -2,9 +2,9 @@ import logging from homeassistant.components.cover import ( - CoverDevice, ENTITY_ID_FORMAT, ATTR_POSITION, ATTR_TILT_POSITION) -from homeassistant.components.fibaro import ( - FIBARO_DEVICES, FibaroDevice) + ATTR_POSITION, ATTR_TILT_POSITION, ENTITY_ID_FORMAT, CoverDevice) + +from . import FIBARO_DEVICES, FibaroDevice DEPENDENCIES = ['fibaro'] diff --git a/homeassistant/components/fibaro/light.py b/homeassistant/components/fibaro/light.py index 5ee3e83b9..600b566b3 100644 --- a/homeassistant/components/fibaro/light.py +++ b/homeassistant/components/fibaro/light.py @@ -1,18 +1,17 @@ """Support for Fibaro lights.""" -import logging import asyncio from functools import partial +import logging -from homeassistant.const import ( - CONF_WHITE_VALUE) -from homeassistant.components.fibaro import ( - FIBARO_DEVICES, FibaroDevice, - CONF_DIMMING, CONF_COLOR, CONF_RESET_COLOR) from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_HS_COLOR, ATTR_WHITE_VALUE, ENTITY_ID_FORMAT, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_WHITE_VALUE, Light) +from homeassistant.const import CONF_WHITE_VALUE import homeassistant.util.color as color_util +from . import ( + CONF_COLOR, CONF_DIMMING, CONF_RESET_COLOR, FIBARO_DEVICES, FibaroDevice) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['fibaro'] diff --git a/homeassistant/components/fibaro/scene.py b/homeassistant/components/fibaro/scene.py index 620f095b7..93f0cd5b6 100644 --- a/homeassistant/components/fibaro/scene.py +++ b/homeassistant/components/fibaro/scene.py @@ -1,10 +1,9 @@ """Support for Fibaro scenes.""" import logging -from homeassistant.components.scene import ( - Scene) -from homeassistant.components.fibaro import ( - FIBARO_DEVICES, FibaroDevice) +from homeassistant.components.scene import Scene + +from . import FIBARO_DEVICES, FibaroDevice DEPENDENCIES = ['fibaro'] diff --git a/homeassistant/components/fibaro/sensor.py b/homeassistant/components/fibaro/sensor.py index 01452d8b3..20a37fd3c 100644 --- a/homeassistant/components/fibaro/sensor.py +++ b/homeassistant/components/fibaro/sensor.py @@ -1,13 +1,13 @@ """Support for Fibaro sensors.""" import logging -from homeassistant.const import ( - DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, - DEVICE_CLASS_ILLUMINANCE, TEMP_CELSIUS, TEMP_FAHRENHEIT) -from homeassistant.helpers.entity import Entity from homeassistant.components.sensor import ENTITY_ID_FORMAT -from homeassistant.components.fibaro import ( - FIBARO_DEVICES, FibaroDevice) +from homeassistant.const import ( + DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE, + TEMP_CELSIUS, TEMP_FAHRENHEIT) +from homeassistant.helpers.entity import Entity + +from . import FIBARO_DEVICES, FibaroDevice SENSOR_TYPES = { 'com.fibaro.temperatureSensor': diff --git a/homeassistant/components/fibaro/switch.py b/homeassistant/components/fibaro/switch.py index 04b8aba1c..024531f62 100644 --- a/homeassistant/components/fibaro/switch.py +++ b/homeassistant/components/fibaro/switch.py @@ -1,10 +1,10 @@ """Support for Fibaro switches.""" import logging -from homeassistant.util import convert from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchDevice -from homeassistant.components.fibaro import ( - FIBARO_DEVICES, FibaroDevice) +from homeassistant.util import convert + +from . import FIBARO_DEVICES, FibaroDevice DEPENDENCIES = ['fibaro'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/freebox/device_tracker.py b/homeassistant/components/freebox/device_tracker.py index fb94f7f56..5418c1c61 100644 --- a/homeassistant/components/freebox/device_tracker.py +++ b/homeassistant/components/freebox/device_tracker.py @@ -3,7 +3,8 @@ from collections import namedtuple import logging from homeassistant.components.device_tracker import DeviceScanner -from homeassistant.components.freebox import DATA_FREEBOX + +from . import DATA_FREEBOX DEPENDENCIES = ['freebox'] diff --git a/homeassistant/components/freebox/sensor.py b/homeassistant/components/freebox/sensor.py index 49e68dc2c..328665ab5 100644 --- a/homeassistant/components/freebox/sensor.py +++ b/homeassistant/components/freebox/sensor.py @@ -1,9 +1,10 @@ """Support for Freebox devices (Freebox v6 and Freebox mini 4K).""" import logging -from homeassistant.components.freebox import DATA_FREEBOX from homeassistant.helpers.entity import Entity +from . import DATA_FREEBOX + DEPENDENCIES = ['freebox'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/fritzbox/binary_sensor.py b/homeassistant/components/fritzbox/binary_sensor.py index c68c79f1e..65578c571 100644 --- a/homeassistant/components/fritzbox/binary_sensor.py +++ b/homeassistant/components/fritzbox/binary_sensor.py @@ -4,7 +4,8 @@ import logging import requests from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.fritzbox import DOMAIN as FRITZBOX_DOMAIN + +from . import DOMAIN as FRITZBOX_DOMAIN DEPENDENCIES = ['fritzbox'] diff --git a/homeassistant/components/fritzbox/climate.py b/homeassistant/components/fritzbox/climate.py index e8c20061b..e2c9be833 100644 --- a/homeassistant/components/fritzbox/climate.py +++ b/homeassistant/components/fritzbox/climate.py @@ -3,19 +3,19 @@ import logging import requests -from homeassistant.components.fritzbox import DOMAIN as FRITZBOX_DOMAIN -from homeassistant.components.fritzbox import ( - ATTR_STATE_DEVICE_LOCKED, ATTR_STATE_BATTERY_LOW, ATTR_STATE_HOLIDAY_MODE, - ATTR_STATE_LOCKED, ATTR_STATE_SUMMER_MODE, - ATTR_STATE_WINDOW_OPEN) from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( ATTR_OPERATION_MODE, STATE_ECO, STATE_HEAT, STATE_MANUAL, - SUPPORT_OPERATION_MODE, - SUPPORT_TARGET_TEMPERATURE) + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( - ATTR_BATTERY_LEVEL, ATTR_TEMPERATURE, PRECISION_HALVES, TEMP_CELSIUS, - STATE_OFF, STATE_ON) + ATTR_BATTERY_LEVEL, ATTR_TEMPERATURE, PRECISION_HALVES, STATE_OFF, + STATE_ON, TEMP_CELSIUS) + +from . import ( + ATTR_STATE_BATTERY_LOW, ATTR_STATE_DEVICE_LOCKED, ATTR_STATE_HOLIDAY_MODE, + ATTR_STATE_LOCKED, ATTR_STATE_SUMMER_MODE, ATTR_STATE_WINDOW_OPEN, + DOMAIN as FRITZBOX_DOMAIN) + DEPENDENCIES = ['fritzbox'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/fritzbox/sensor.py b/homeassistant/components/fritzbox/sensor.py index a1736fb98..7309f8cc6 100644 --- a/homeassistant/components/fritzbox/sensor.py +++ b/homeassistant/components/fritzbox/sensor.py @@ -3,11 +3,11 @@ import logging import requests -from homeassistant.components.fritzbox import DOMAIN as FRITZBOX_DOMAIN -from homeassistant.components.fritzbox import ( - ATTR_STATE_DEVICE_LOCKED, ATTR_STATE_LOCKED) -from homeassistant.helpers.entity import Entity from homeassistant.const import TEMP_CELSIUS +from homeassistant.helpers.entity import Entity + +from . import ( + ATTR_STATE_DEVICE_LOCKED, ATTR_STATE_LOCKED, DOMAIN as FRITZBOX_DOMAIN) DEPENDENCIES = ['fritzbox'] diff --git a/homeassistant/components/fritzbox/switch.py b/homeassistant/components/fritzbox/switch.py index 617c49020..e227cdaef 100644 --- a/homeassistant/components/fritzbox/switch.py +++ b/homeassistant/components/fritzbox/switch.py @@ -3,12 +3,12 @@ import logging import requests -from homeassistant.components.fritzbox import DOMAIN as FRITZBOX_DOMAIN -from homeassistant.components.fritzbox import ( - ATTR_STATE_DEVICE_LOCKED, ATTR_STATE_LOCKED) from homeassistant.components.switch import SwitchDevice -from homeassistant.const import (ATTR_TEMPERATURE, TEMP_CELSIUS, - ENERGY_KILO_WATT_HOUR) +from homeassistant.const import ( + ATTR_TEMPERATURE, ENERGY_KILO_WATT_HOUR, TEMP_CELSIUS) + +from . import ( + ATTR_STATE_DEVICE_LOCKED, ATTR_STATE_LOCKED, DOMAIN as FRITZBOX_DOMAIN) DEPENDENCIES = ['fritzbox'] diff --git a/homeassistant/components/gc100/binary_sensor.py b/homeassistant/components/gc100/binary_sensor.py index 27466f64c..ec69d1eec 100644 --- a/homeassistant/components/gc100/binary_sensor.py +++ b/homeassistant/components/gc100/binary_sensor.py @@ -6,12 +6,13 @@ https://home-assistant.io/components/binary_sensor.gc100/ """ import voluptuous as vol -from homeassistant.components.gc100 import DATA_GC100, CONF_PORTS from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) + PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import DEVICE_DEFAULT_NAME import homeassistant.helpers.config_validation as cv +from . import CONF_PORTS, DATA_GC100 + DEPENDENCIES = ['gc100'] _SENSORS_SCHEMA = vol.Schema({ diff --git a/homeassistant/components/gc100/switch.py b/homeassistant/components/gc100/switch.py index 2a8e7eaa8..94c824fa5 100644 --- a/homeassistant/components/gc100/switch.py +++ b/homeassistant/components/gc100/switch.py @@ -6,11 +6,12 @@ https://home-assistant.io/components/switch.gc100/ """ import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.gc100 import DATA_GC100, CONF_PORTS -from homeassistant.components.switch import (PLATFORM_SCHEMA) -from homeassistant.helpers.entity import ToggleEntity +from homeassistant.components.switch import PLATFORM_SCHEMA from homeassistant.const import DEVICE_DEFAULT_NAME +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import ToggleEntity + +from . import CONF_PORTS, DATA_GC100 DEPENDENCIES = ['gc100'] diff --git a/homeassistant/components/geo_location/demo.py b/homeassistant/components/geo_location/demo.py index 523e125a7..d63280ce6 100644 --- a/homeassistant/components/geo_location/demo.py +++ b/homeassistant/components/geo_location/demo.py @@ -5,9 +5,10 @@ from math import cos, pi, radians, sin import random from typing import Optional -from homeassistant.components.geo_location import GeolocationEvent from homeassistant.helpers.event import track_time_interval +from . import GeolocationEvent + _LOGGER = logging.getLogger(__name__) AVG_KM_PER_DEGREE = 111.0 diff --git a/homeassistant/components/geofency/device_tracker.py b/homeassistant/components/geofency/device_tracker.py index 51201240c..5e7b82918 100644 --- a/homeassistant/components/geofency/device_tracker.py +++ b/homeassistant/components/geofency/device_tracker.py @@ -8,10 +8,10 @@ import logging from homeassistant.components.device_tracker import ( DOMAIN as DEVICE_TRACKER_DOMAIN) -from homeassistant.components.geofency import ( - DOMAIN as GEOFENCY_DOMAIN, TRACKER_UPDATE) from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import DOMAIN as GEOFENCY_DOMAIN, TRACKER_UPDATE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['geofency'] diff --git a/homeassistant/components/google/calendar.py b/homeassistant/components/google/calendar.py index cc65c6d65..9f71e7c4f 100644 --- a/homeassistant/components/google/calendar.py +++ b/homeassistant/components/google/calendar.py @@ -1,14 +1,14 @@ """Support for Google Calendar Search binary sensors.""" -import logging from datetime import timedelta +import logging from homeassistant.components.calendar import CalendarEventDevice -from homeassistant.components.google import ( - CONF_CAL_ID, CONF_ENTITIES, CONF_TRACK, TOKEN_FILE, - CONF_IGNORE_AVAILABILITY, CONF_SEARCH, - GoogleCalendarService) from homeassistant.util import Throttle, dt +from . import ( + CONF_CAL_ID, CONF_ENTITIES, CONF_IGNORE_AVAILABILITY, CONF_SEARCH, + CONF_TRACK, TOKEN_FILE, GoogleCalendarService) + _LOGGER = logging.getLogger(__name__) DEFAULT_GOOGLE_SEARCH_PARAMS = { diff --git a/homeassistant/components/googlehome/device_tracker.py b/homeassistant/components/googlehome/device_tracker.py index 462f5db3b..c024cde0c 100644 --- a/homeassistant/components/googlehome/device_tracker.py +++ b/homeassistant/components/googlehome/device_tracker.py @@ -1,13 +1,13 @@ """Support for Google Home Bluetooth tacker.""" -import logging from datetime import timedelta +import logging from homeassistant.components.device_tracker import DeviceScanner -from homeassistant.components.googlehome import ( - CLIENT, DOMAIN as GOOGLEHOME_DOMAIN, NAME) from homeassistant.helpers.event import async_track_time_interval from homeassistant.util import slugify +from . import CLIENT, DOMAIN as GOOGLEHOME_DOMAIN, NAME + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['googlehome'] diff --git a/homeassistant/components/googlehome/sensor.py b/homeassistant/components/googlehome/sensor.py index 7577ee0b0..4f37740da 100644 --- a/homeassistant/components/googlehome/sensor.py +++ b/homeassistant/components/googlehome/sensor.py @@ -1,13 +1,13 @@ """Support for Google Home alarm sensor.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.googlehome import ( - CLIENT, DOMAIN as GOOGLEHOME_DOMAIN, NAME) from homeassistant.const import DEVICE_CLASS_TIMESTAMP from homeassistant.helpers.entity import Entity import homeassistant.util.dt as dt_util +from . import CLIENT, DOMAIN as GOOGLEHOME_DOMAIN, NAME + DEPENDENCIES = ['googlehome'] SCAN_INTERVAL = timedelta(seconds=10) diff --git a/homeassistant/components/gpslogger/device_tracker.py b/homeassistant/components/gpslogger/device_tracker.py index 90d2dc04f..c94969752 100644 --- a/homeassistant/components/gpslogger/device_tracker.py +++ b/homeassistant/components/gpslogger/device_tracker.py @@ -1,13 +1,13 @@ """Support for the GPSLogger device tracking.""" import logging -from homeassistant.components.device_tracker import DOMAIN as \ - DEVICE_TRACKER_DOMAIN -from homeassistant.components.gpslogger import DOMAIN as GPSLOGGER_DOMAIN, \ - TRACKER_UPDATE +from homeassistant.components.device_tracker import ( + DOMAIN as DEVICE_TRACKER_DOMAIN) from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import HomeAssistantType +from . import DOMAIN as GPSLOGGER_DOMAIN, TRACKER_UPDATE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['gpslogger'] diff --git a/homeassistant/components/hangouts/__init__.py b/homeassistant/components/hangouts/__init__.py index 4796744c1..2d36de8b7 100644 --- a/homeassistant/components/hangouts/__init__.py +++ b/homeassistant/components/hangouts/__init__.py @@ -4,12 +4,12 @@ import logging import voluptuous as vol from homeassistant import config_entries -from homeassistant.components.hangouts.intents import HelpIntent from homeassistant.const import EVENT_HOMEASSISTANT_STOP from homeassistant.helpers import dispatcher, intent import homeassistant.helpers.config_validation as cv # We need an import from .config_flow, without it .config_flow is never loaded. +from .intents import HelpIntent from .config_flow import HangoutsFlowHandler # noqa: F401 from .const import ( CONF_BOT, CONF_DEFAULT_CONVERSATIONS, CONF_ERROR_SUPPRESSED_CONVERSATIONS, diff --git a/homeassistant/components/hangouts/const.py b/homeassistant/components/hangouts/const.py index ca0fdf986..38b238292 100644 --- a/homeassistant/components/hangouts/const.py +++ b/homeassistant/components/hangouts/const.py @@ -7,7 +7,7 @@ from homeassistant.components.notify import ( ATTR_DATA, ATTR_MESSAGE, ATTR_TARGET) import homeassistant.helpers.config_validation as cv -_LOGGER = logging.getLogger('homeassistant.components.hangouts') +_LOGGER = logging.getLogger('.') DOMAIN = 'hangouts' diff --git a/homeassistant/components/hangouts/notify.py b/homeassistant/components/hangouts/notify.py index c3b5450be..de9af2e07 100644 --- a/homeassistant/components/hangouts/notify.py +++ b/homeassistant/components/hangouts/notify.py @@ -3,12 +3,13 @@ import logging import voluptuous as vol -from homeassistant.components.hangouts.const import ( - CONF_DEFAULT_CONVERSATIONS, DOMAIN, SERVICE_SEND_MESSAGE, TARGETS_SCHEMA) from homeassistant.components.notify import ( ATTR_DATA, ATTR_MESSAGE, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) +from .const import ( + CONF_DEFAULT_CONVERSATIONS, DOMAIN, SERVICE_SEND_MESSAGE, TARGETS_SCHEMA) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = [DOMAIN] diff --git a/homeassistant/components/hdmi_cec/media_player.py b/homeassistant/components/hdmi_cec/media_player.py index 553983a1f..b2d2910e1 100644 --- a/homeassistant/components/hdmi_cec/media_player.py +++ b/homeassistant/components/hdmi_cec/media_player.py @@ -1,7 +1,6 @@ """Support for HDMI CEC devices as media players.""" import logging -from homeassistant.components.hdmi_cec import ATTR_NEW, CecDevice from homeassistant.components.media_player import MediaPlayerDevice from homeassistant.components.media_player.const import ( DOMAIN, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA, @@ -10,6 +9,8 @@ from homeassistant.components.media_player.const import ( from homeassistant.const import ( STATE_IDLE, STATE_OFF, STATE_ON, STATE_PAUSED, STATE_PLAYING) +from . import ATTR_NEW, CecDevice + DEPENDENCIES = ['hdmi_cec'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/hdmi_cec/switch.py b/homeassistant/components/hdmi_cec/switch.py index ff423890b..639f54570 100644 --- a/homeassistant/components/hdmi_cec/switch.py +++ b/homeassistant/components/hdmi_cec/switch.py @@ -1,10 +1,11 @@ """Support for HDMI CEC devices as switches.""" import logging -from homeassistant.components.hdmi_cec import ATTR_NEW, CecDevice from homeassistant.components.switch import DOMAIN, SwitchDevice from homeassistant.const import STATE_OFF, STATE_ON, STATE_STANDBY +from . import ATTR_NEW, CecDevice + DEPENDENCIES = ['hdmi_cec'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/hive/binary_sensor.py b/homeassistant/components/hive/binary_sensor.py index dee27c5c7..a0973f4d8 100644 --- a/homeassistant/components/hive/binary_sensor.py +++ b/homeassistant/components/hive/binary_sensor.py @@ -1,6 +1,7 @@ """Support for the Hive binary sensors.""" from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.hive import DATA_HIVE, DOMAIN + +from . import DATA_HIVE, DOMAIN DEPENDENCIES = ['hive'] diff --git a/homeassistant/components/hive/climate.py b/homeassistant/components/hive/climate.py index 45829cda0..dac7feb29 100644 --- a/homeassistant/components/hive/climate.py +++ b/homeassistant/components/hive/climate.py @@ -1,12 +1,13 @@ """Support for the Hive climate devices.""" from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_AUTO, STATE_HEAT, - SUPPORT_AUX_HEAT, SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE) -from homeassistant.components.hive import DATA_HIVE, DOMAIN + STATE_AUTO, STATE_HEAT, SUPPORT_AUX_HEAT, SUPPORT_OPERATION_MODE, + SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( ATTR_TEMPERATURE, STATE_OFF, STATE_ON, TEMP_CELSIUS) +from . import DATA_HIVE, DOMAIN + DEPENDENCIES = ['hive'] HIVE_TO_HASS_STATE = { diff --git a/homeassistant/components/hive/light.py b/homeassistant/components/hive/light.py index 2bec60f0e..3a2176c3e 100644 --- a/homeassistant/components/hive/light.py +++ b/homeassistant/components/hive/light.py @@ -1,10 +1,11 @@ """Support for the Hive lights.""" -from homeassistant.components.hive import DATA_HIVE, DOMAIN from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) import homeassistant.util.color as color_util +from . import DATA_HIVE, DOMAIN + DEPENDENCIES = ['hive'] diff --git a/homeassistant/components/hive/sensor.py b/homeassistant/components/hive/sensor.py index 142c8c7ee..e7b7d6b45 100644 --- a/homeassistant/components/hive/sensor.py +++ b/homeassistant/components/hive/sensor.py @@ -1,8 +1,9 @@ """Support for the Hive sensors.""" -from homeassistant.components.hive import DATA_HIVE, DOMAIN from homeassistant.const import TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import DATA_HIVE, DOMAIN + DEPENDENCIES = ['hive'] FRIENDLY_NAMES = { diff --git a/homeassistant/components/hive/switch.py b/homeassistant/components/hive/switch.py index c897e37f3..fd4d3d69b 100644 --- a/homeassistant/components/hive/switch.py +++ b/homeassistant/components/hive/switch.py @@ -1,7 +1,8 @@ """Support for the Hive switches.""" -from homeassistant.components.hive import DATA_HIVE, DOMAIN from homeassistant.components.switch import SwitchDevice +from . import DATA_HIVE, DOMAIN + DEPENDENCIES = ['hive'] diff --git a/homeassistant/components/hlk_sw16/switch.py b/homeassistant/components/hlk_sw16/switch.py index b1bfc5ce2..164a504fa 100644 --- a/homeassistant/components/hlk_sw16/switch.py +++ b/homeassistant/components/hlk_sw16/switch.py @@ -1,13 +1,11 @@ """Support for HLK-SW16 switches.""" import logging -from homeassistant.components.hlk_sw16 import ( - SW16Device, DOMAIN as HLK_SW16, - DATA_DEVICE_REGISTER) -from homeassistant.components.switch import ( - ToggleEntity) +from homeassistant.components.switch import ToggleEntity from homeassistant.const import CONF_NAME +from . import DATA_DEVICE_REGISTER, DOMAIN as HLK_SW16, SW16Device + DEPENDENCIES = [HLK_SW16] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homekit_controller/alarm_control_panel.py b/homeassistant/components/homekit_controller/alarm_control_panel.py index 61352c3be..9bc15aad7 100644 --- a/homeassistant/components/homekit_controller/alarm_control_panel.py +++ b/homeassistant/components/homekit_controller/alarm_control_panel.py @@ -2,12 +2,12 @@ import logging from homeassistant.components.alarm_control_panel import AlarmControlPanel -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) from homeassistant.const import ( ATTR_BATTERY_LEVEL, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED) +from . import KNOWN_ACCESSORIES, HomeKitEntity + DEPENDENCIES = ['homekit_controller'] ICON = 'mdi:security' diff --git a/homeassistant/components/homekit_controller/binary_sensor.py b/homeassistant/components/homekit_controller/binary_sensor.py index 5d83ce6d9..7fcc5b4e8 100644 --- a/homeassistant/components/homekit_controller/binary_sensor.py +++ b/homeassistant/components/homekit_controller/binary_sensor.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) + +from . import KNOWN_ACCESSORIES, HomeKitEntity DEPENDENCIES = ['homekit_controller'] diff --git a/homeassistant/components/homekit_controller/climate.py b/homeassistant/components/homekit_controller/climate.py index 8696d2b1f..243b795e7 100644 --- a/homeassistant/components/homekit_controller/climate.py +++ b/homeassistant/components/homekit_controller/climate.py @@ -3,11 +3,11 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_HEAT, STATE_COOL, STATE_IDLE, - SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE) -from homeassistant.components.homekit_controller import ( - HomeKitEntity, KNOWN_ACCESSORIES) -from homeassistant.const import TEMP_CELSIUS, STATE_OFF, ATTR_TEMPERATURE + STATE_COOL, STATE_HEAT, STATE_IDLE, SUPPORT_OPERATION_MODE, + SUPPORT_TARGET_TEMPERATURE) +from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, TEMP_CELSIUS + +from . import KNOWN_ACCESSORIES, HomeKitEntity DEPENDENCIES = ['homekit_controller'] diff --git a/homeassistant/components/homekit_controller/cover.py b/homeassistant/components/homekit_controller/cover.py index 4cd4c9ed2..4db1246b9 100644 --- a/homeassistant/components/homekit_controller/cover.py +++ b/homeassistant/components/homekit_controller/cover.py @@ -5,11 +5,11 @@ from homeassistant.components.cover import ( ATTR_POSITION, ATTR_TILT_POSITION, SUPPORT_CLOSE, SUPPORT_CLOSE_TILT, SUPPORT_OPEN, SUPPORT_OPEN_TILT, SUPPORT_SET_POSITION, SUPPORT_SET_TILT_POSITION, CoverDevice) -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) from homeassistant.const import ( STATE_CLOSED, STATE_CLOSING, STATE_OPEN, STATE_OPENING) +from . import KNOWN_ACCESSORIES, HomeKitEntity + STATE_STOPPED = 'stopped' DEPENDENCIES = ['homekit_controller'] diff --git a/homeassistant/components/homekit_controller/light.py b/homeassistant/components/homekit_controller/light.py index b5677c0e0..db8fd332c 100644 --- a/homeassistant/components/homekit_controller/light.py +++ b/homeassistant/components/homekit_controller/light.py @@ -1,12 +1,12 @@ """Support for Homekit lights.""" import logging -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) +from . import KNOWN_ACCESSORIES, HomeKitEntity + DEPENDENCIES = ['homekit_controller'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homekit_controller/lock.py b/homeassistant/components/homekit_controller/lock.py index 6da5fa356..a2aac5767 100644 --- a/homeassistant/components/homekit_controller/lock.py +++ b/homeassistant/components/homekit_controller/lock.py @@ -1,12 +1,12 @@ """Support for HomeKit Controller locks.""" import logging -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) from homeassistant.components.lock import LockDevice from homeassistant.const import ( ATTR_BATTERY_LEVEL, STATE_LOCKED, STATE_UNLOCKED) +from . import KNOWN_ACCESSORIES, HomeKitEntity + DEPENDENCIES = ['homekit_controller'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homekit_controller/sensor.py b/homeassistant/components/homekit_controller/sensor.py index 5af0016eb..955a1a792 100644 --- a/homeassistant/components/homekit_controller/sensor.py +++ b/homeassistant/components/homekit_controller/sensor.py @@ -1,8 +1,8 @@ """Support for Homekit sensors.""" -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) from homeassistant.const import TEMP_CELSIUS +from . import KNOWN_ACCESSORIES, HomeKitEntity + DEPENDENCIES = ['homekit_controller'] HUMIDITY_ICON = 'mdi-water-percent' diff --git a/homeassistant/components/homekit_controller/switch.py b/homeassistant/components/homekit_controller/switch.py index 21f10e624..ba19413d4 100644 --- a/homeassistant/components/homekit_controller/switch.py +++ b/homeassistant/components/homekit_controller/switch.py @@ -1,10 +1,10 @@ """Support for Homekit switches.""" import logging -from homeassistant.components.homekit_controller import ( - KNOWN_ACCESSORIES, HomeKitEntity) from homeassistant.components.switch import SwitchDevice +from . import KNOWN_ACCESSORIES, HomeKitEntity + DEPENDENCIES = ['homekit_controller'] OUTLET_IN_USE = "outlet_in_use" diff --git a/homeassistant/components/homematic/binary_sensor.py b/homeassistant/components/homematic/binary_sensor.py index 1704411c9..7bf260a9b 100644 --- a/homeassistant/components/homematic/binary_sensor.py +++ b/homeassistant/components/homematic/binary_sensor.py @@ -2,9 +2,10 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.homematic import ATTR_DISCOVER_DEVICES, HMDevice from homeassistant.const import STATE_UNKNOWN +from . import ATTR_DISCOVER_DEVICES, HMDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematic'] diff --git a/homeassistant/components/homematic/climate.py b/homeassistant/components/homematic/climate.py index e5eb292b4..146cad1bc 100644 --- a/homeassistant/components/homematic/climate.py +++ b/homeassistant/components/homematic/climate.py @@ -5,10 +5,10 @@ from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( STATE_AUTO, STATE_MANUAL, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.homematic import ( - ATTR_DISCOVER_DEVICES, HM_ATTRIBUTE_SUPPORT, HMDevice) from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS +from . import ATTR_DISCOVER_DEVICES, HM_ATTRIBUTE_SUPPORT, HMDevice + DEPENDENCIES = ['homematic'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homematic/cover.py b/homeassistant/components/homematic/cover.py index 79a1afe9a..33b764dc3 100644 --- a/homeassistant/components/homematic/cover.py +++ b/homeassistant/components/homematic/cover.py @@ -3,9 +3,10 @@ import logging from homeassistant.components.cover import ( ATTR_POSITION, ATTR_TILT_POSITION, CoverDevice) -from homeassistant.components.homematic import ATTR_DISCOVER_DEVICES, HMDevice from homeassistant.const import STATE_UNKNOWN +from . import ATTR_DISCOVER_DEVICES, HMDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematic'] diff --git a/homeassistant/components/homematic/light.py b/homeassistant/components/homematic/light.py index 21b875742..c36014611 100644 --- a/homeassistant/components/homematic/light.py +++ b/homeassistant/components/homematic/light.py @@ -1,11 +1,12 @@ """Support for Homematic lights.""" import logging -from homeassistant.components.homematic import ATTR_DISCOVER_DEVICES, HMDevice from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_EFFECT, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_EFFECT, Light) +from . import ATTR_DISCOVER_DEVICES, HMDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematic'] diff --git a/homeassistant/components/homematic/lock.py b/homeassistant/components/homematic/lock.py index 5d857617f..3c0ca040c 100644 --- a/homeassistant/components/homematic/lock.py +++ b/homeassistant/components/homematic/lock.py @@ -1,10 +1,11 @@ """Support for Homematic locks.""" import logging -from homeassistant.components.homematic import ATTR_DISCOVER_DEVICES, HMDevice from homeassistant.components.lock import SUPPORT_OPEN, LockDevice from homeassistant.const import STATE_UNKNOWN +from . import ATTR_DISCOVER_DEVICES, HMDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematic'] diff --git a/homeassistant/components/homematic/notify.py b/homeassistant/components/homematic/notify.py index e6ef1a60e..021560eee 100644 --- a/homeassistant/components/homematic/notify.py +++ b/homeassistant/components/homematic/notify.py @@ -8,14 +8,15 @@ import logging import voluptuous as vol -from homeassistant.components.homematic import ( - ATTR_ADDRESS, ATTR_CHANNEL, ATTR_INTERFACE, ATTR_PARAM, ATTR_VALUE, DOMAIN, - SERVICE_SET_DEVICE_VALUE) from homeassistant.components.notify import ( ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) import homeassistant.helpers.config_validation as cv import homeassistant.helpers.template as template_helper +from . import ( + ATTR_ADDRESS, ATTR_CHANNEL, ATTR_INTERFACE, ATTR_PARAM, ATTR_VALUE, DOMAIN, + SERVICE_SET_DEVICE_VALUE) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ["homematic"] diff --git a/homeassistant/components/homematic/sensor.py b/homeassistant/components/homematic/sensor.py index 8e3e55e1f..401d11f70 100644 --- a/homeassistant/components/homematic/sensor.py +++ b/homeassistant/components/homematic/sensor.py @@ -1,8 +1,9 @@ """Support for HomeMatic sensors.""" import logging -from homeassistant.components.homematic import ATTR_DISCOVER_DEVICES, HMDevice -from homeassistant.const import STATE_UNKNOWN, POWER_WATT, ENERGY_WATT_HOUR +from homeassistant.const import ENERGY_WATT_HOUR, POWER_WATT, STATE_UNKNOWN + +from . import ATTR_DISCOVER_DEVICES, HMDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homematic/switch.py b/homeassistant/components/homematic/switch.py index cfcd26891..393ad09b3 100644 --- a/homeassistant/components/homematic/switch.py +++ b/homeassistant/components/homematic/switch.py @@ -1,10 +1,11 @@ """Support for HomeMatic switches.""" import logging -from homeassistant.components.homematic import ATTR_DISCOVER_DEVICES, HMDevice from homeassistant.components.switch import SwitchDevice from homeassistant.const import STATE_UNKNOWN +from . import ATTR_DISCOVER_DEVICES, HMDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematic'] diff --git a/homeassistant/components/homematicip_cloud/alarm_control_panel.py b/homeassistant/components/homematicip_cloud/alarm_control_panel.py index efa1ea1f4..eb5855bb9 100644 --- a/homeassistant/components/homematicip_cloud/alarm_control_panel.py +++ b/homeassistant/components/homematicip_cloud/alarm_control_panel.py @@ -2,12 +2,12 @@ import logging from homeassistant.components.alarm_control_panel import AlarmControlPanel -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED) +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematicip_cloud'] diff --git a/homeassistant/components/homematicip_cloud/binary_sensor.py b/homeassistant/components/homematicip_cloud/binary_sensor.py index 9445d6521..786a28a70 100644 --- a/homeassistant/components/homematicip_cloud/binary_sensor.py +++ b/homeassistant/components/homematicip_cloud/binary_sensor.py @@ -2,10 +2,9 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) -from homeassistant.components.homematicip_cloud.device import ( - ATTR_GROUP_MEMBER_UNREACHABLE) + +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice +from .device import ATTR_GROUP_MEMBER_UNREACHABLE DEPENDENCIES = ['homematicip_cloud'] diff --git a/homeassistant/components/homematicip_cloud/climate.py b/homeassistant/components/homematicip_cloud/climate.py index 08c88bbb7..955f3e5ba 100644 --- a/homeassistant/components/homematicip_cloud/climate.py +++ b/homeassistant/components/homematicip_cloud/climate.py @@ -4,10 +4,10 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( STATE_AUTO, STATE_MANUAL, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice + _LOGGER = logging.getLogger(__name__) STATE_BOOST = 'Boost' diff --git a/homeassistant/components/homematicip_cloud/const.py b/homeassistant/components/homematicip_cloud/const.py index fbda56f28..c9a5df601 100644 --- a/homeassistant/components/homematicip_cloud/const.py +++ b/homeassistant/components/homematicip_cloud/const.py @@ -1,7 +1,7 @@ """Constants for the HomematicIP Cloud component.""" import logging -_LOGGER = logging.getLogger('homeassistant.components.homematicip_cloud') +_LOGGER = logging.getLogger('.') DOMAIN = 'homematicip_cloud' diff --git a/homeassistant/components/homematicip_cloud/cover.py b/homeassistant/components/homematicip_cloud/cover.py index 86c11dab7..735e87896 100644 --- a/homeassistant/components/homematicip_cloud/cover.py +++ b/homeassistant/components/homematicip_cloud/cover.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.cover import ATTR_POSITION, CoverDevice -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) + +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice DEPENDENCIES = ['homematicip_cloud'] diff --git a/homeassistant/components/homematicip_cloud/light.py b/homeassistant/components/homematicip_cloud/light.py index 73c607683..f8b19b5bb 100644 --- a/homeassistant/components/homematicip_cloud/light.py +++ b/homeassistant/components/homematicip_cloud/light.py @@ -1,12 +1,12 @@ """Support for HomematicIP Cloud lights.""" import logging -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_NAME, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light) +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice + DEPENDENCIES = ['homematicip_cloud'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homematicip_cloud/sensor.py b/homeassistant/components/homematicip_cloud/sensor.py index d61559983..397587394 100644 --- a/homeassistant/components/homematicip_cloud/sensor.py +++ b/homeassistant/components/homematicip_cloud/sensor.py @@ -1,12 +1,12 @@ """Support for HomematicIP Cloud sensors.""" import logging -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) from homeassistant.const import ( DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE, POWER_WATT, TEMP_CELSIUS) +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['homematicip_cloud'] diff --git a/homeassistant/components/homematicip_cloud/switch.py b/homeassistant/components/homematicip_cloud/switch.py index 74f50f87b..62e72f0ad 100644 --- a/homeassistant/components/homematicip_cloud/switch.py +++ b/homeassistant/components/homematicip_cloud/switch.py @@ -1,12 +1,11 @@ """Support for HomematicIP Cloud switches.""" import logging -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) -from homeassistant.components.homematicip_cloud.device import ( - ATTR_GROUP_MEMBER_UNREACHABLE) from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice +from .device import ATTR_GROUP_MEMBER_UNREACHABLE + DEPENDENCIES = ['homematicip_cloud'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homematicip_cloud/weather.py b/homeassistant/components/homematicip_cloud/weather.py index 5a6261195..101adcdea 100644 --- a/homeassistant/components/homematicip_cloud/weather.py +++ b/homeassistant/components/homematicip_cloud/weather.py @@ -2,10 +2,10 @@ """Support for HomematicIP Cloud weather devices.""" import logging -from homeassistant.components.homematicip_cloud import ( - DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice) from homeassistant.components.weather import WeatherEntity +from . import DOMAIN as HMIPC_DOMAIN, HMIPC_HAPID, HomematicipGenericDevice + DEPENDENCIES = ['homematicip_cloud'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homeworks/light.py b/homeassistant/components/homeworks/light.py index 7f5d7f6aa..ca41dff98 100644 --- a/homeassistant/components/homeworks/light.py +++ b/homeassistant/components/homeworks/light.py @@ -1,15 +1,16 @@ """Support for Lutron Homeworks lights.""" import logging -from homeassistant.components.homeworks import ( - CONF_ADDR, CONF_DIMMERS, CONF_RATE, ENTITY_SIGNAL, HOMEWORKS_CONTROLLER, - HomeworksDevice) from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) from homeassistant.const import CONF_NAME from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import ( + CONF_ADDR, CONF_DIMMERS, CONF_RATE, ENTITY_SIGNAL, HOMEWORKS_CONTROLLER, + HomeworksDevice) + DEPENDENCIES = ['homeworks'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/http/view.py b/homeassistant/components/http/view.py index bb7f2c2fe..daac9fef7 100644 --- a/homeassistant/components/http/view.py +++ b/homeassistant/components/http/view.py @@ -9,12 +9,12 @@ from aiohttp.web_exceptions import ( import voluptuous as vol from homeassistant import exceptions -from homeassistant.components.http.ban import process_success_login from homeassistant.const import CONTENT_TYPE_JSON from homeassistant.core import Context, is_callback from homeassistant.helpers.json import JSONEncoder -from .const import KEY_AUTHENTICATED, KEY_REAL_IP, KEY_HASS +from .ban import process_success_login +from .const import KEY_AUTHENTICATED, KEY_HASS, KEY_REAL_IP _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/hue/const.py b/homeassistant/components/hue/const.py index 2eb30d478..d61a0aa7e 100644 --- a/homeassistant/components/hue/const.py +++ b/homeassistant/components/hue/const.py @@ -1,6 +1,6 @@ """Constants for the Hue component.""" import logging -LOGGER = logging.getLogger('homeassistant.components.hue') +LOGGER = logging.getLogger('.') DOMAIN = "hue" API_NUPNP = 'https://www.meethue.com/api/nupnp' diff --git a/homeassistant/components/hydrawise/binary_sensor.py b/homeassistant/components/hydrawise/binary_sensor.py index bfe7cbd55..85a51d364 100644 --- a/homeassistant/components/hydrawise/binary_sensor.py +++ b/homeassistant/components/hydrawise/binary_sensor.py @@ -3,13 +3,14 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.hydrawise import ( - BINARY_SENSORS, DATA_HYDRAWISE, HydrawiseEntity, DEVICE_MAP, - DEVICE_MAP_INDEX) from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) + PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv + +from . import ( + BINARY_SENSORS, DATA_HYDRAWISE, DEVICE_MAP, DEVICE_MAP_INDEX, + HydrawiseEntity) DEPENDENCIES = ['hydrawise'] diff --git a/homeassistant/components/hydrawise/sensor.py b/homeassistant/components/hydrawise/sensor.py index 575686b92..fc15a54ed 100644 --- a/homeassistant/components/hydrawise/sensor.py +++ b/homeassistant/components/hydrawise/sensor.py @@ -3,11 +3,12 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.hydrawise import ( - DATA_HYDRAWISE, HydrawiseEntity, DEVICE_MAP, DEVICE_MAP_INDEX, SENSORS) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv + +from . import ( + DATA_HYDRAWISE, DEVICE_MAP, DEVICE_MAP_INDEX, SENSORS, HydrawiseEntity) DEPENDENCIES = ['hydrawise'] diff --git a/homeassistant/components/hydrawise/switch.py b/homeassistant/components/hydrawise/switch.py index a6a8b9c54..dcbd5274a 100644 --- a/homeassistant/components/hydrawise/switch.py +++ b/homeassistant/components/hydrawise/switch.py @@ -3,13 +3,14 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.hydrawise import ( - ALLOWED_WATERING_TIME, CONF_WATERING_TIME, - DATA_HYDRAWISE, DEFAULT_WATERING_TIME, HydrawiseEntity, SWITCHES, - DEVICE_MAP, DEVICE_MAP_INDEX) from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv + +from . import ( + ALLOWED_WATERING_TIME, CONF_WATERING_TIME, DATA_HYDRAWISE, + DEFAULT_WATERING_TIME, DEVICE_MAP, DEVICE_MAP_INDEX, SWITCHES, + HydrawiseEntity) DEPENDENCIES = ['hydrawise'] diff --git a/homeassistant/components/ifttt/alarm_control_panel.py b/homeassistant/components/ifttt/alarm_control_panel.py index 98a176b1e..3f8061731 100644 --- a/homeassistant/components/ifttt/alarm_control_panel.py +++ b/homeassistant/components/ifttt/alarm_control_panel.py @@ -7,14 +7,14 @@ import voluptuous as vol import homeassistant.components.alarm_control_panel as alarm from homeassistant.components.alarm_control_panel import ( DOMAIN, PLATFORM_SCHEMA) -from homeassistant.components.ifttt import ( - ATTR_EVENT, DOMAIN as IFTTT_DOMAIN, SERVICE_TRIGGER) from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_STATE, CONF_CODE, CONF_NAME, CONF_OPTIMISTIC, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED) import homeassistant.helpers.config_validation as cv +from . import ATTR_EVENT, DOMAIN as IFTTT_DOMAIN, SERVICE_TRIGGER + DEPENDENCIES = ['ifttt'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ihc/__init__.py b/homeassistant/components/ihc/__init__.py index daaf471e3..102acd825 100644 --- a/homeassistant/components/ihc/__init__.py +++ b/homeassistant/components/ihc/__init__.py @@ -5,13 +5,6 @@ import os.path import voluptuous as vol from homeassistant.components.binary_sensor import DEVICE_CLASSES_SCHEMA -from homeassistant.components.ihc.const import ( - ATTR_IHC_ID, ATTR_VALUE, CONF_AUTOSETUP, CONF_BINARY_SENSOR, CONF_DIMMABLE, - CONF_INFO, CONF_INVERTING, CONF_LIGHT, CONF_NODE, CONF_NOTE, CONF_OFF_ID, - CONF_ON_ID, CONF_POSITION, CONF_SENSOR, CONF_SWITCH, CONF_XPATH, - SERVICE_SET_RUNTIME_VALUE_BOOL, SERVICE_SET_RUNTIME_VALUE_FLOAT, - SERVICE_SET_RUNTIME_VALUE_INT, SERVICE_PULSE) -from homeassistant.components.ihc.util import async_pulse from homeassistant.config import load_yaml_config_file from homeassistant.const import ( CONF_ID, CONF_NAME, CONF_PASSWORD, CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, @@ -20,6 +13,14 @@ from homeassistant.helpers import discovery import homeassistant.helpers.config_validation as cv from homeassistant.helpers.typing import HomeAssistantType +from .const import ( + ATTR_IHC_ID, ATTR_VALUE, CONF_AUTOSETUP, CONF_BINARY_SENSOR, CONF_DIMMABLE, + CONF_INFO, CONF_INVERTING, CONF_LIGHT, CONF_NODE, CONF_NOTE, CONF_OFF_ID, + CONF_ON_ID, CONF_POSITION, CONF_SENSOR, CONF_SWITCH, CONF_XPATH, + SERVICE_PULSE, SERVICE_SET_RUNTIME_VALUE_BOOL, + SERVICE_SET_RUNTIME_VALUE_FLOAT, SERVICE_SET_RUNTIME_VALUE_INT) +from .util import async_pulse + REQUIREMENTS = ['ihcsdk==2.3.0', 'defusedxml==0.5.0'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ihc/binary_sensor.py b/homeassistant/components/ihc/binary_sensor.py index 7e3371a83..69e3e1685 100644 --- a/homeassistant/components/ihc/binary_sensor.py +++ b/homeassistant/components/ihc/binary_sensor.py @@ -1,10 +1,11 @@ """Support for IHC binary sensors.""" from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.ihc import IHC_CONTROLLER, IHC_DATA, IHC_INFO -from homeassistant.components.ihc.const import CONF_INVERTING -from homeassistant.components.ihc.ihcdevice import IHCDevice from homeassistant.const import CONF_TYPE +from . import IHC_CONTROLLER, IHC_DATA, IHC_INFO +from .const import CONF_INVERTING +from .ihcdevice import IHCDevice + DEPENDENCIES = ['ihc'] diff --git a/homeassistant/components/ihc/light.py b/homeassistant/components/ihc/light.py index 646be7597..ad6d0fb65 100644 --- a/homeassistant/components/ihc/light.py +++ b/homeassistant/components/ihc/light.py @@ -1,15 +1,14 @@ """Support for IHC lights.""" import logging -from homeassistant.components.ihc import IHC_CONTROLLER, IHC_DATA, IHC_INFO -from homeassistant.components.ihc.const import ( - CONF_DIMMABLE, CONF_OFF_ID, CONF_ON_ID) -from homeassistant.components.ihc.util import ( - async_pulse, async_set_bool, async_set_int) -from homeassistant.components.ihc.ihcdevice import IHCDevice from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) +from . import IHC_CONTROLLER, IHC_DATA, IHC_INFO +from .const import CONF_DIMMABLE, CONF_OFF_ID, CONF_ON_ID +from .ihcdevice import IHCDevice +from .util import async_pulse, async_set_bool, async_set_int + DEPENDENCIES = ['ihc'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ihc/sensor.py b/homeassistant/components/ihc/sensor.py index 930ac2216..fd1f2cee5 100644 --- a/homeassistant/components/ihc/sensor.py +++ b/homeassistant/components/ihc/sensor.py @@ -1,9 +1,10 @@ """Support for IHC sensors.""" -from homeassistant.components.ihc import IHC_CONTROLLER, IHC_DATA, IHC_INFO -from homeassistant.components.ihc.ihcdevice import IHCDevice from homeassistant.const import CONF_UNIT_OF_MEASUREMENT from homeassistant.helpers.entity import Entity +from . import IHC_CONTROLLER, IHC_DATA, IHC_INFO +from .ihcdevice import IHCDevice + DEPENDENCIES = ['ihc'] diff --git a/homeassistant/components/ihc/switch.py b/homeassistant/components/ihc/switch.py index d25b34344..e2189492b 100644 --- a/homeassistant/components/ihc/switch.py +++ b/homeassistant/components/ihc/switch.py @@ -1,10 +1,11 @@ """Support for IHC switches.""" -from homeassistant.components.ihc import IHC_CONTROLLER, IHC_DATA, IHC_INFO -from homeassistant.components.ihc.const import CONF_OFF_ID, CONF_ON_ID -from homeassistant.components.ihc.util import async_pulse, async_set_bool -from homeassistant.components.ihc.ihcdevice import IHCDevice from homeassistant.components.switch import SwitchDevice +from . import IHC_CONTROLLER, IHC_DATA, IHC_INFO +from .const import CONF_OFF_ID, CONF_ON_ID +from .ihcdevice import IHCDevice +from .util import async_pulse, async_set_bool + DEPENDENCIES = ['ihc'] diff --git a/homeassistant/components/influxdb/sensor.py b/homeassistant/components/influxdb/sensor.py index 35229c2a8..9dbb4787d 100644 --- a/homeassistant/components/influxdb/sensor.py +++ b/homeassistant/components/influxdb/sensor.py @@ -9,7 +9,6 @@ import logging import voluptuous as vol -from homeassistant.components.influxdb import CONF_DB_NAME from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_SSL, @@ -20,6 +19,8 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle +from . import CONF_DB_NAME + _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ['influxdb==5.2.0'] diff --git a/homeassistant/components/insteon/binary_sensor.py b/homeassistant/components/insteon/binary_sensor.py index 06eddb9a0..6f1e56756 100644 --- a/homeassistant/components/insteon/binary_sensor.py +++ b/homeassistant/components/insteon/binary_sensor.py @@ -2,7 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.insteon import InsteonEntity + +from . import InsteonEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/insteon/cover.py b/homeassistant/components/insteon/cover.py index 7de2e8724..1bb316152 100644 --- a/homeassistant/components/insteon/cover.py +++ b/homeassistant/components/insteon/cover.py @@ -5,7 +5,8 @@ import math from homeassistant.components.cover import ( ATTR_POSITION, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_SET_POSITION, CoverDevice) -from homeassistant.components.insteon import InsteonEntity + +from . import InsteonEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/insteon/fan.py b/homeassistant/components/insteon/fan.py index 2b6097a4b..26a56d6df 100644 --- a/homeassistant/components/insteon/fan.py +++ b/homeassistant/components/insteon/fan.py @@ -4,9 +4,10 @@ import logging from homeassistant.components.fan import ( SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SPEED_OFF, SUPPORT_SET_SPEED, FanEntity) -from homeassistant.components.insteon import InsteonEntity from homeassistant.const import STATE_OFF +from . import InsteonEntity + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['insteon'] diff --git a/homeassistant/components/insteon/light.py b/homeassistant/components/insteon/light.py index e8ffc2267..676c05332 100644 --- a/homeassistant/components/insteon/light.py +++ b/homeassistant/components/insteon/light.py @@ -1,10 +1,11 @@ """Support for Insteon lights via PowerLinc Modem.""" import logging -from homeassistant.components.insteon import InsteonEntity from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) +from . import InsteonEntity + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['insteon'] diff --git a/homeassistant/components/insteon/sensor.py b/homeassistant/components/insteon/sensor.py index d895d9720..edea87e1f 100644 --- a/homeassistant/components/insteon/sensor.py +++ b/homeassistant/components/insteon/sensor.py @@ -1,9 +1,10 @@ """Support for INSTEON dimmers via PowerLinc Modem.""" import logging -from homeassistant.components.insteon import InsteonEntity from homeassistant.helpers.entity import Entity +from . import InsteonEntity + DEPENDENCIES = ['insteon'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/insteon/switch.py b/homeassistant/components/insteon/switch.py index 2a6b97a39..4fdcdb20b 100644 --- a/homeassistant/components/insteon/switch.py +++ b/homeassistant/components/insteon/switch.py @@ -1,9 +1,10 @@ """Support for INSTEON dimmers via PowerLinc Modem.""" import logging -from homeassistant.components.insteon import InsteonEntity from homeassistant.components.switch import SwitchDevice +from . import InsteonEntity + DEPENDENCIES = ['insteon'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/iota/sensor.py b/homeassistant/components/iota/sensor.py index 5cd5db616..2955828af 100644 --- a/homeassistant/components/iota/sensor.py +++ b/homeassistant/components/iota/sensor.py @@ -1,10 +1,11 @@ """Support for IOTA wallet sensors.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.iota import IotaDevice, CONF_WALLETS from homeassistant.const import CONF_NAME +from . import CONF_WALLETS, IotaDevice + _LOGGER = logging.getLogger(__name__) ATTR_TESTNET = 'testnet' diff --git a/homeassistant/components/iperf3/sensor.py b/homeassistant/components/iperf3/sensor.py index 59813ae04..db9aafcdf 100644 --- a/homeassistant/components/iperf3/sensor.py +++ b/homeassistant/components/iperf3/sensor.py @@ -1,11 +1,11 @@ """Support for Iperf3 sensors.""" -from homeassistant.components.iperf3 import ( - DATA_UPDATED, DOMAIN as IPERF3_DOMAIN, SENSOR_TYPES, ATTR_VERSION) from homeassistant.const import ATTR_ATTRIBUTION from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.restore_state import RestoreEntity +from . import ATTR_VERSION, DATA_UPDATED, DOMAIN as IPERF3_DOMAIN, SENSOR_TYPES + DEPENDENCIES = ['iperf3'] ATTRIBUTION = 'Data retrieved using Iperf3' diff --git a/homeassistant/components/ipma/const.py b/homeassistant/components/ipma/const.py index bdd97c74e..1e778eff5 100644 --- a/homeassistant/components/ipma/const.py +++ b/homeassistant/components/ipma/const.py @@ -11,4 +11,4 @@ ENTITY_ID_SENSOR_FORMAT = WEATHER_DOMAIN + ".ipma_{}" ENTITY_ID_SENSOR_FORMAT_HOME = ENTITY_ID_SENSOR_FORMAT.format( HOME_LOCATION_NAME) -_LOGGER = logging.getLogger('homeassistant.components.ipma') +_LOGGER = logging.getLogger('.') diff --git a/homeassistant/components/isy994/binary_sensor.py b/homeassistant/components/isy994/binary_sensor.py index 013b99fbb..ce95e71e8 100644 --- a/homeassistant/components/isy994/binary_sensor.py +++ b/homeassistant/components/isy994/binary_sensor.py @@ -4,14 +4,14 @@ import logging from typing import Callable from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice -from homeassistant.components.isy994 import ( - ISY994_NODES, ISY994_PROGRAMS, ISYDevice) from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.core import callback from homeassistant.helpers.event import async_track_point_in_utc_time from homeassistant.helpers.typing import ConfigType from homeassistant.util import dt as dt_util +from . import ISY994_NODES, ISY994_PROGRAMS, ISYDevice + _LOGGER = logging.getLogger(__name__) ISY_DEVICE_TYPES = { diff --git a/homeassistant/components/isy994/cover.py b/homeassistant/components/isy994/cover.py index 22ea16297..b40d6428f 100644 --- a/homeassistant/components/isy994/cover.py +++ b/homeassistant/components/isy994/cover.py @@ -3,12 +3,12 @@ import logging from typing import Callable from homeassistant.components.cover import DOMAIN, CoverDevice -from homeassistant.components.isy994 import ( - ISY994_NODES, ISY994_PROGRAMS, ISYDevice) from homeassistant.const import ( STATE_CLOSED, STATE_CLOSING, STATE_OPEN, STATE_OPENING, STATE_UNKNOWN) from homeassistant.helpers.typing import ConfigType +from . import ISY994_NODES, ISY994_PROGRAMS, ISYDevice + _LOGGER = logging.getLogger(__name__) VALUE_TO_STATE = { diff --git a/homeassistant/components/isy994/fan.py b/homeassistant/components/isy994/fan.py index 142eaedd6..5a21a28fd 100644 --- a/homeassistant/components/isy994/fan.py +++ b/homeassistant/components/isy994/fan.py @@ -5,10 +5,10 @@ from typing import Callable from homeassistant.components.fan import ( DOMAIN, SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SPEED_OFF, SUPPORT_SET_SPEED, FanEntity) -from homeassistant.components.isy994 import ( - ISY994_NODES, ISY994_PROGRAMS, ISYDevice) from homeassistant.helpers.typing import ConfigType +from . import ISY994_NODES, ISY994_PROGRAMS, ISYDevice + _LOGGER = logging.getLogger(__name__) VALUE_TO_STATE = { diff --git a/homeassistant/components/isy994/light.py b/homeassistant/components/isy994/light.py index cc39a6d1a..0ac50a5f3 100644 --- a/homeassistant/components/isy994/light.py +++ b/homeassistant/components/isy994/light.py @@ -2,10 +2,11 @@ import logging from typing import Callable -from homeassistant.components.isy994 import ISY994_NODES, ISYDevice from homeassistant.components.light import DOMAIN, SUPPORT_BRIGHTNESS, Light from homeassistant.helpers.typing import ConfigType +from . import ISY994_NODES, ISYDevice + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/isy994/lock.py b/homeassistant/components/isy994/lock.py index a2e8b1a1e..92cb317ed 100644 --- a/homeassistant/components/isy994/lock.py +++ b/homeassistant/components/isy994/lock.py @@ -2,12 +2,12 @@ import logging from typing import Callable -from homeassistant.components.isy994 import ( - ISY994_NODES, ISY994_PROGRAMS, ISYDevice) from homeassistant.components.lock import DOMAIN, LockDevice from homeassistant.const import STATE_LOCKED, STATE_UNKNOWN, STATE_UNLOCKED from homeassistant.helpers.typing import ConfigType +from . import ISY994_NODES, ISY994_PROGRAMS, ISYDevice + _LOGGER = logging.getLogger(__name__) VALUE_TO_STATE = { diff --git a/homeassistant/components/isy994/sensor.py b/homeassistant/components/isy994/sensor.py index 2115c19f4..43c016ed4 100644 --- a/homeassistant/components/isy994/sensor.py +++ b/homeassistant/components/isy994/sensor.py @@ -2,13 +2,13 @@ import logging from typing import Callable -from homeassistant.components.isy994 import ( - ISY994_NODES, ISY994_WEATHER, ISYDevice) from homeassistant.components.sensor import DOMAIN from homeassistant.const import ( - TEMP_CELSIUS, TEMP_FAHRENHEIT, UNIT_UV_INDEX, POWER_WATT) + POWER_WATT, TEMP_CELSIUS, TEMP_FAHRENHEIT, UNIT_UV_INDEX) from homeassistant.helpers.typing import ConfigType +from . import ISY994_NODES, ISY994_WEATHER, ISYDevice + _LOGGER = logging.getLogger(__name__) UOM_FRIENDLY_NAME = { diff --git a/homeassistant/components/isy994/switch.py b/homeassistant/components/isy994/switch.py index 96f17c80b..5f0acd1b1 100644 --- a/homeassistant/components/isy994/switch.py +++ b/homeassistant/components/isy994/switch.py @@ -2,11 +2,11 @@ import logging from typing import Callable -from homeassistant.components.isy994 import ( - ISY994_NODES, ISY994_PROGRAMS, ISYDevice) from homeassistant.components.switch import DOMAIN, SwitchDevice from homeassistant.helpers.typing import ConfigType +from . import ISY994_NODES, ISY994_PROGRAMS, ISYDevice + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/juicenet/sensor.py b/homeassistant/components/juicenet/sensor.py index 00b183fca..6b55e5395 100644 --- a/homeassistant/components/juicenet/sensor.py +++ b/homeassistant/components/juicenet/sensor.py @@ -1,9 +1,10 @@ """Support for monitoring juicenet/juicepoint/juicebox based EVSE sensors.""" import logging -from homeassistant.const import TEMP_CELSIUS, POWER_WATT, ENERGY_WATT_HOUR +from homeassistant.const import ENERGY_WATT_HOUR, POWER_WATT, TEMP_CELSIUS from homeassistant.helpers.entity import Entity -from homeassistant.components.juicenet import JuicenetDevice, DOMAIN + +from . import DOMAIN, JuicenetDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/knx/binary_sensor.py b/homeassistant/components/knx/binary_sensor.py index c84e5820f..8ee21e24c 100644 --- a/homeassistant/components/knx/binary_sensor.py +++ b/homeassistant/components/knx/binary_sensor.py @@ -3,12 +3,12 @@ import voluptuous as vol from homeassistant.components.binary_sensor import ( PLATFORM_SCHEMA, BinarySensorDevice) -from homeassistant.components.knx import ( - ATTR_DISCOVER_DEVICES, DATA_KNX, KNXAutomation) from homeassistant.const import CONF_ADDRESS, CONF_DEVICE_CLASS, CONF_NAME from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from . import ATTR_DISCOVER_DEVICES, DATA_KNX, KNXAutomation + CONF_SIGNIFICANT_BIT = 'significant_bit' CONF_DEFAULT_SIGNIFICANT_BIT = 1 CONF_AUTOMATION = 'automation' diff --git a/homeassistant/components/knx/climate.py b/homeassistant/components/knx/climate.py index 921b2936d..e11e54493 100644 --- a/homeassistant/components/knx/climate.py +++ b/homeassistant/components/knx/climate.py @@ -5,11 +5,12 @@ from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice from homeassistant.components.climate.const import ( STATE_DRY, STATE_ECO, STATE_FAN_ONLY, STATE_HEAT, STATE_IDLE, STATE_MANUAL, SUPPORT_ON_OFF, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.const import ATTR_TEMPERATURE, CONF_NAME, TEMP_CELSIUS from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + CONF_SETPOINT_SHIFT_ADDRESS = 'setpoint_shift_address' CONF_SETPOINT_SHIFT_STATE_ADDRESS = 'setpoint_shift_state_address' CONF_SETPOINT_SHIFT_STEP = 'setpoint_shift_step' diff --git a/homeassistant/components/knx/cover.py b/homeassistant/components/knx/cover.py index 9423983f9..b2b287d1e 100644 --- a/homeassistant/components/knx/cover.py +++ b/homeassistant/components/knx/cover.py @@ -5,12 +5,13 @@ from homeassistant.components.cover import ( ATTR_POSITION, ATTR_TILT_POSITION, PLATFORM_SCHEMA, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_SET_POSITION, SUPPORT_SET_TILT_POSITION, SUPPORT_STOP, CoverDevice) -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.const import CONF_NAME from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.event import async_track_utc_time_change +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + CONF_MOVE_LONG_ADDRESS = 'move_long_address' CONF_MOVE_SHORT_ADDRESS = 'move_short_address' CONF_POSITION_ADDRESS = 'position_address' diff --git a/homeassistant/components/knx/light.py b/homeassistant/components/knx/light.py index baba7edd2..cf59f1fc1 100644 --- a/homeassistant/components/knx/light.py +++ b/homeassistant/components/knx/light.py @@ -3,7 +3,6 @@ from enum import Enum import voluptuous as vol -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) @@ -12,6 +11,8 @@ from homeassistant.core import callback import homeassistant.helpers.config_validation as cv import homeassistant.util.color as color_util +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + CONF_STATE_ADDRESS = 'state_address' CONF_BRIGHTNESS_ADDRESS = 'brightness_address' CONF_BRIGHTNESS_STATE_ADDRESS = 'brightness_state_address' diff --git a/homeassistant/components/knx/notify.py b/homeassistant/components/knx/notify.py index 1e1d7f185..742252d18 100644 --- a/homeassistant/components/knx/notify.py +++ b/homeassistant/components/knx/notify.py @@ -1,13 +1,14 @@ """Support for KNX/IP notification services.""" import voluptuous as vol -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.components.notify import ( PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_ADDRESS, CONF_NAME from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + DEFAULT_NAME = 'KNX Notify' DEPENDENCIES = ['knx'] diff --git a/homeassistant/components/knx/scene.py b/homeassistant/components/knx/scene.py index b1bb2bf31..4bf186c28 100644 --- a/homeassistant/components/knx/scene.py +++ b/homeassistant/components/knx/scene.py @@ -1,12 +1,13 @@ """Support for KNX scenes.""" import voluptuous as vol -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.components.scene import CONF_PLATFORM, Scene from homeassistant.const import CONF_ADDRESS, CONF_NAME from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + CONF_SCENE_NUMBER = 'scene_number' DEFAULT_NAME = 'KNX SCENE' diff --git a/homeassistant/components/knx/sensor.py b/homeassistant/components/knx/sensor.py index abbb61e15..7ddafe53b 100644 --- a/homeassistant/components/knx/sensor.py +++ b/homeassistant/components/knx/sensor.py @@ -1,13 +1,14 @@ """Support for KNX/IP sensors.""" import voluptuous as vol -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + DEFAULT_NAME = 'KNX Sensor' DEPENDENCIES = ['knx'] diff --git a/homeassistant/components/knx/switch.py b/homeassistant/components/knx/switch.py index cef14fb74..e3beff396 100644 --- a/homeassistant/components/knx/switch.py +++ b/homeassistant/components/knx/switch.py @@ -1,12 +1,13 @@ """Support for KNX/IP switches.""" import voluptuous as vol -from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import CONF_ADDRESS, CONF_NAME from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from . import ATTR_DISCOVER_DEVICES, DATA_KNX + CONF_STATE_ADDRESS = 'state_address' DEFAULT_NAME = 'KNX Switch' diff --git a/homeassistant/components/konnected/binary_sensor.py b/homeassistant/components/konnected/binary_sensor.py index a47f81b95..1fbfbea18 100644 --- a/homeassistant/components/konnected/binary_sensor.py +++ b/homeassistant/components/konnected/binary_sensor.py @@ -2,14 +2,14 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.konnected import ( - DOMAIN as KONNECTED_DOMAIN, PIN_TO_ZONE, SIGNAL_SENSOR_UPDATE) from homeassistant.const import ( - CONF_DEVICES, CONF_TYPE, CONF_NAME, CONF_BINARY_SENSORS, ATTR_ENTITY_ID, - ATTR_STATE) + ATTR_ENTITY_ID, ATTR_STATE, CONF_BINARY_SENSORS, CONF_DEVICES, CONF_NAME, + CONF_TYPE) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import DOMAIN as KONNECTED_DOMAIN, PIN_TO_ZONE, SIGNAL_SENSOR_UPDATE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['konnected'] diff --git a/homeassistant/components/konnected/sensor.py b/homeassistant/components/konnected/sensor.py index eb3f55113..a48d1a586 100644 --- a/homeassistant/components/konnected/sensor.py +++ b/homeassistant/components/konnected/sensor.py @@ -1,15 +1,16 @@ """Support for DHT and DS18B20 sensors attached to a Konnected device.""" import logging -from homeassistant.components.konnected.const import ( - DOMAIN as KONNECTED_DOMAIN, SIGNAL_DS18B20_NEW, SIGNAL_SENSOR_UPDATE) from homeassistant.const import ( - CONF_DEVICES, CONF_PIN, CONF_TYPE, CONF_NAME, CONF_SENSORS, + CONF_DEVICES, CONF_NAME, CONF_PIN, CONF_SENSORS, CONF_TYPE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity +from .const import ( + DOMAIN as KONNECTED_DOMAIN, SIGNAL_DS18B20_NEW, SIGNAL_SENSOR_UPDATE) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['konnected'] diff --git a/homeassistant/components/konnected/switch.py b/homeassistant/components/konnected/switch.py index 1a4b49529..dfb135e19 100644 --- a/homeassistant/components/konnected/switch.py +++ b/homeassistant/components/konnected/switch.py @@ -1,12 +1,13 @@ """Support for wired switches attached to a Konnected device.""" import logging -from homeassistant.components.konnected import ( - DOMAIN as KONNECTED_DOMAIN, PIN_TO_ZONE, CONF_ACTIVATION, CONF_MOMENTARY, - CONF_PAUSE, CONF_REPEAT, STATE_LOW, STATE_HIGH) -from homeassistant.helpers.entity import ToggleEntity from homeassistant.const import ( ATTR_STATE, CONF_DEVICES, CONF_NAME, CONF_PIN, CONF_SWITCHES) +from homeassistant.helpers.entity import ToggleEntity + +from . import ( + CONF_ACTIVATION, CONF_MOMENTARY, CONF_PAUSE, CONF_REPEAT, + DOMAIN as KONNECTED_DOMAIN, PIN_TO_ZONE, STATE_HIGH, STATE_LOW) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lametric/notify.py b/homeassistant/components/lametric/notify.py index 9903676d9..358bb056b 100644 --- a/homeassistant/components/lametric/notify.py +++ b/homeassistant/components/lametric/notify.py @@ -5,11 +5,11 @@ from requests.exceptions import ConnectionError as RequestsConnectionError import voluptuous as vol from homeassistant.components.notify import ( - ATTR_TARGET, ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) + ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_ICON import homeassistant.helpers.config_validation as cv -from homeassistant.components.lametric import DOMAIN as LAMETRIC_DOMAIN +from . import DOMAIN as LAMETRIC_DOMAIN REQUIREMENTS = ['lmnotify==0.0.4'] diff --git a/homeassistant/components/lcn/__init__.py b/homeassistant/components/lcn/__init__.py index 6b9956434..e380c2bb4 100644 --- a/homeassistant/components/lcn/__init__.py +++ b/homeassistant/components/lcn/__init__.py @@ -3,12 +3,6 @@ import logging import voluptuous as vol -from homeassistant.components.lcn.const import ( - CONF_CONNECTIONS, CONF_DIM_MODE, CONF_DIMMABLE, CONF_MOTOR, CONF_OUTPUT, - CONF_SK_NUM_TRIES, CONF_SOURCE, CONF_TRANSITION, DATA_LCN, DEFAULT_NAME, - DIM_MODES, DOMAIN, LED_PORTS, LOGICOP_PORTS, MOTOR_PORTS, OUTPUT_PORTS, - PATTERN_ADDRESS, RELAY_PORTS, S0_INPUTS, SETPOINTS, THRESHOLDS, VAR_UNITS, - VARIABLES) from homeassistant.const import ( CONF_ADDRESS, CONF_COVERS, CONF_HOST, CONF_LIGHTS, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_SENSORS, CONF_SWITCHES, @@ -17,6 +11,13 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.discovery import async_load_platform from homeassistant.helpers.entity import Entity +from .const import ( + CONF_CONNECTIONS, CONF_DIM_MODE, CONF_DIMMABLE, CONF_MOTOR, CONF_OUTPUT, + CONF_SK_NUM_TRIES, CONF_SOURCE, CONF_TRANSITION, DATA_LCN, DEFAULT_NAME, + DIM_MODES, DOMAIN, LED_PORTS, LOGICOP_PORTS, MOTOR_PORTS, OUTPUT_PORTS, + PATTERN_ADDRESS, RELAY_PORTS, S0_INPUTS, SETPOINTS, THRESHOLDS, VAR_UNITS, + VARIABLES) + _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ['pypck==0.5.9'] diff --git a/homeassistant/components/lcn/cover.py b/homeassistant/components/lcn/cover.py index 4b4542fd6..a32ff7c23 100755 --- a/homeassistant/components/lcn/cover.py +++ b/homeassistant/components/lcn/cover.py @@ -1,10 +1,10 @@ """Support for LCN covers.""" from homeassistant.components.cover import CoverDevice -from homeassistant.components.lcn import LcnDevice, get_connection -from homeassistant.components.lcn.const import ( - CONF_CONNECTIONS, CONF_MOTOR, DATA_LCN) from homeassistant.const import CONF_ADDRESS +from . import LcnDevice, get_connection +from .const import CONF_CONNECTIONS, CONF_MOTOR, DATA_LCN + DEPENDENCIES = ['lcn'] diff --git a/homeassistant/components/lcn/light.py b/homeassistant/components/lcn/light.py index 5f1008cbd..00b782593 100644 --- a/homeassistant/components/lcn/light.py +++ b/homeassistant/components/lcn/light.py @@ -1,13 +1,14 @@ """Support for LCN lights.""" -from homeassistant.components.lcn import LcnDevice, get_connection -from homeassistant.components.lcn.const import ( - CONF_CONNECTIONS, CONF_DIMMABLE, CONF_OUTPUT, CONF_TRANSITION, DATA_LCN, - OUTPUT_PORTS) from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_TRANSITION, SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION, Light) from homeassistant.const import CONF_ADDRESS +from . import LcnDevice, get_connection +from .const import ( + CONF_CONNECTIONS, CONF_DIMMABLE, CONF_OUTPUT, CONF_TRANSITION, DATA_LCN, + OUTPUT_PORTS) + DEPENDENCIES = ['lcn'] diff --git a/homeassistant/components/lcn/sensor.py b/homeassistant/components/lcn/sensor.py index e56c42de0..5e50d092a 100755 --- a/homeassistant/components/lcn/sensor.py +++ b/homeassistant/components/lcn/sensor.py @@ -1,9 +1,10 @@ """Support for LCN sensors.""" -from homeassistant.components.lcn import LcnDevice, get_connection -from homeassistant.components.lcn.const import ( +from homeassistant.const import CONF_ADDRESS, CONF_UNIT_OF_MEASUREMENT + +from . import LcnDevice, get_connection +from .const import ( CONF_CONNECTIONS, CONF_SOURCE, DATA_LCN, LED_PORTS, S0_INPUTS, SETPOINTS, THRESHOLDS, VARIABLES) -from homeassistant.const import CONF_ADDRESS, CONF_UNIT_OF_MEASUREMENT DEPENDENCIES = ['lcn'] diff --git a/homeassistant/components/lcn/switch.py b/homeassistant/components/lcn/switch.py index 09f35d267..7c375f4a5 100755 --- a/homeassistant/components/lcn/switch.py +++ b/homeassistant/components/lcn/switch.py @@ -1,10 +1,10 @@ """Support for LCN switches.""" -from homeassistant.components.lcn import LcnDevice, get_connection -from homeassistant.components.lcn.const import ( - CONF_CONNECTIONS, CONF_OUTPUT, DATA_LCN, OUTPUT_PORTS) from homeassistant.components.switch import SwitchDevice from homeassistant.const import CONF_ADDRESS +from . import LcnDevice, get_connection +from .const import CONF_CONNECTIONS, CONF_OUTPUT, DATA_LCN, OUTPUT_PORTS + DEPENDENCIES = ['lcn'] diff --git a/homeassistant/components/lifx/light.py b/homeassistant/components/lifx/light.py index 19a9f7583..014ca9ae6 100644 --- a/homeassistant/components/lifx/light.py +++ b/homeassistant/components/lifx/light.py @@ -16,9 +16,6 @@ from homeassistant.components.light import ( SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, SUPPORT_TRANSITION, VALID_BRIGHTNESS, VALID_BRIGHTNESS_PCT, Light, preprocess_turn_on_alternatives) -from homeassistant.components.lifx import ( - DOMAIN as LIFX_DOMAIN, DATA_LIFX_MANAGER, CONF_SERVER, CONF_PORT, - CONF_BROADCAST) from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_STOP from homeassistant.core import callback import homeassistant.helpers.config_validation as cv @@ -27,6 +24,10 @@ from homeassistant.helpers.event import async_track_point_in_utc_time from homeassistant.helpers.service import async_extract_entity_ids import homeassistant.util.color as color_util +from . import ( + CONF_BROADCAST, CONF_PORT, CONF_SERVER, DATA_LIFX_MANAGER, + DOMAIN as LIFX_DOMAIN) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['lifx'] diff --git a/homeassistant/components/light/demo.py b/homeassistant/components/light/demo.py index 980d84917..d9affb03d 100644 --- a/homeassistant/components/light/demo.py +++ b/homeassistant/components/light/demo.py @@ -6,10 +6,10 @@ https://home-assistant.io/components/demo/ """ import random -from homeassistant.components.light import ( +from . import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_HS_COLOR, - ATTR_WHITE_VALUE, SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, - SUPPORT_COLOR, SUPPORT_WHITE_VALUE, Light) + ATTR_WHITE_VALUE, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, + SUPPORT_EFFECT, SUPPORT_WHITE_VALUE, Light) LIGHT_COLORS = [ (56, 86), diff --git a/homeassistant/components/light/group.py b/homeassistant/components/light/group.py index bf54d3ecf..7e9d11d3a 100644 --- a/homeassistant/components/light/group.py +++ b/homeassistant/components/light/group.py @@ -4,27 +4,28 @@ This platform allows several lights to be grouped into one light. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/light.group/ """ -import logging -import itertools -from typing import List, Tuple, Optional, Iterator, Any, Callable from collections import Counter +import itertools +import logging +from typing import Any, Callable, Iterator, List, Optional, Tuple import voluptuous as vol -from homeassistant.core import State, callback from homeassistant.components import light -from homeassistant.const import (STATE_ON, ATTR_ENTITY_ID, CONF_NAME, - CONF_ENTITIES, STATE_UNAVAILABLE, - ATTR_SUPPORTED_FEATURES) -from homeassistant.helpers.event import async_track_state_change -from homeassistant.helpers.typing import HomeAssistantType, ConfigType -from homeassistant.components.light import ( - SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_TRANSITION, - SUPPORT_EFFECT, SUPPORT_FLASH, SUPPORT_WHITE_VALUE, PLATFORM_SCHEMA, - ATTR_BRIGHTNESS, ATTR_HS_COLOR, ATTR_WHITE_VALUE, ATTR_COLOR_TEMP, - ATTR_MIN_MIREDS, ATTR_MAX_MIREDS, ATTR_EFFECT_LIST, ATTR_EFFECT, - ATTR_FLASH, ATTR_TRANSITION) +from homeassistant.const import ( + ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, CONF_ENTITIES, CONF_NAME, + STATE_ON, STATE_UNAVAILABLE) +from homeassistant.core import State, callback import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.event import async_track_state_change +from homeassistant.helpers.typing import ConfigType, HomeAssistantType + +from . import ( + ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_EFFECT_LIST, + ATTR_FLASH, ATTR_HS_COLOR, ATTR_MAX_MIREDS, ATTR_MIN_MIREDS, + ATTR_TRANSITION, ATTR_WHITE_VALUE, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, + SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, SUPPORT_FLASH, + SUPPORT_TRANSITION, SUPPORT_WHITE_VALUE) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/light/switch.py b/homeassistant/components/light/switch.py index de6247a27..4b4f33133 100644 --- a/homeassistant/components/light/switch.py +++ b/homeassistant/components/light/switch.py @@ -5,22 +5,18 @@ For more information about this platform, please refer to the documentation at https://home-assistant.io/components/light.switch/ """ import logging + import voluptuous as vol -from homeassistant.core import State, callback -from homeassistant.components.light import ( - Light, PLATFORM_SCHEMA) from homeassistant.components import switch from homeassistant.const import ( - STATE_ON, - ATTR_ENTITY_ID, - CONF_NAME, - CONF_ENTITY_ID, - STATE_UNAVAILABLE -) -from homeassistant.helpers.typing import HomeAssistantType, ConfigType -from homeassistant.helpers.event import async_track_state_change + ATTR_ENTITY_ID, CONF_ENTITY_ID, CONF_NAME, STATE_ON, STATE_UNAVAILABLE) +from homeassistant.core import State, callback import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.event import async_track_state_change +from homeassistant.helpers.typing import ConfigType, HomeAssistantType + +from . import PLATFORM_SCHEMA, Light _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lightwave/light.py b/homeassistant/components/lightwave/light.py index 1dfbac37c..f22533d25 100644 --- a/homeassistant/components/lightwave/light.py +++ b/homeassistant/components/lightwave/light.py @@ -1,9 +1,10 @@ """Support for LightwaveRF lights.""" from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) -from homeassistant.components.lightwave import LIGHTWAVE_LINK from homeassistant.const import CONF_NAME +from . import LIGHTWAVE_LINK + DEPENDENCIES = ['lightwave'] MAX_BRIGHTNESS = 255 diff --git a/homeassistant/components/lightwave/switch.py b/homeassistant/components/lightwave/switch.py index d6c00b7fd..dfa93b4b1 100644 --- a/homeassistant/components/lightwave/switch.py +++ b/homeassistant/components/lightwave/switch.py @@ -1,8 +1,9 @@ """Support for LightwaveRF switches.""" -from homeassistant.components.lightwave import LIGHTWAVE_LINK from homeassistant.components.switch import SwitchDevice from homeassistant.const import CONF_NAME +from . import LIGHTWAVE_LINK + DEPENDENCIES = ['lightwave'] diff --git a/homeassistant/components/linode/binary_sensor.py b/homeassistant/components/linode/binary_sensor.py index a05681497..19455917d 100644 --- a/homeassistant/components/linode/binary_sensor.py +++ b/homeassistant/components/linode/binary_sensor.py @@ -5,11 +5,12 @@ import voluptuous as vol from homeassistant.components.binary_sensor import ( PLATFORM_SCHEMA, BinarySensorDevice) -from homeassistant.components.linode import ( +import homeassistant.helpers.config_validation as cv + +from . import ( ATTR_CREATED, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, ATTR_NODE_ID, ATTR_NODE_NAME, ATTR_REGION, ATTR_VCPUS, CONF_NODES, DATA_LINODE) -import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/linode/switch.py b/homeassistant/components/linode/switch.py index 0cab2f4d0..e5f97ef75 100644 --- a/homeassistant/components/linode/switch.py +++ b/homeassistant/components/linode/switch.py @@ -3,12 +3,13 @@ import logging import voluptuous as vol -from homeassistant.components.linode import ( +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +import homeassistant.helpers.config_validation as cv + +from . import ( ATTR_CREATED, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, ATTR_NODE_ID, ATTR_NODE_NAME, ATTR_REGION, ATTR_VCPUS, CONF_NODES, DATA_LINODE) -from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice -import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/locative/device_tracker.py b/homeassistant/components/locative/device_tracker.py index 78090914b..9dbf7e74f 100644 --- a/homeassistant/components/locative/device_tracker.py +++ b/homeassistant/components/locative/device_tracker.py @@ -6,13 +6,13 @@ https://home-assistant.io/components/device_tracker.locative/ """ import logging -from homeassistant.components.device_tracker import \ - DOMAIN as DEVICE_TRACKER_DOMAIN -from homeassistant.components.locative import DOMAIN as LOCATIVE_DOMAIN -from homeassistant.components.locative import TRACKER_UPDATE +from homeassistant.components.device_tracker import ( + DOMAIN as DEVICE_TRACKER_DOMAIN) from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.util import slugify +from . import DOMAIN as LOCATIVE_DOMAIN, TRACKER_UPDATE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['locative'] diff --git a/homeassistant/components/lock/demo.py b/homeassistant/components/lock/demo.py index a0cc45991..94a67fb87 100644 --- a/homeassistant/components/lock/demo.py +++ b/homeassistant/components/lock/demo.py @@ -4,8 +4,9 @@ Demo lock platform that has two fake locks. For more details about this platform, please refer to the documentation https://home-assistant.io/components/demo/ """ -from homeassistant.components.lock import LockDevice, SUPPORT_OPEN -from homeassistant.const import (STATE_LOCKED, STATE_UNLOCKED) +from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED + +from . import SUPPORT_OPEN, LockDevice def setup_platform(hass, config, add_entities, discovery_info=None): diff --git a/homeassistant/components/logi_circle/camera.py b/homeassistant/components/logi_circle/camera.py index 4f349dd98..814475d04 100644 --- a/homeassistant/components/logi_circle/camera.py +++ b/homeassistant/components/logi_circle/camera.py @@ -1,19 +1,19 @@ """Support to the Logi Circle cameras.""" -import logging import asyncio from datetime import timedelta +import logging import voluptuous as vol -from homeassistant.helpers import config_validation as cv -from homeassistant.components.logi_circle import ( - DOMAIN as LOGI_CIRCLE_DOMAIN, ATTRIBUTION) from homeassistant.components.camera import ( - Camera, PLATFORM_SCHEMA, CAMERA_SERVICE_SCHEMA, SUPPORT_ON_OFF, - ATTR_ENTITY_ID, ATTR_FILENAME, DOMAIN) + ATTR_ENTITY_ID, ATTR_FILENAME, CAMERA_SERVICE_SCHEMA, DOMAIN, + PLATFORM_SCHEMA, SUPPORT_ON_OFF, Camera) from homeassistant.const import ( ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL, - CONF_SCAN_INTERVAL, STATE_ON, STATE_OFF) + CONF_SCAN_INTERVAL, STATE_OFF, STATE_ON) +from homeassistant.helpers import config_validation as cv + +from . import ATTRIBUTION, DOMAIN as LOGI_CIRCLE_DOMAIN DEPENDENCIES = ['logi_circle'] diff --git a/homeassistant/components/logi_circle/sensor.py b/homeassistant/components/logi_circle/sensor.py index 483021909..06d1701a9 100644 --- a/homeassistant/components/logi_circle/sensor.py +++ b/homeassistant/components/logi_circle/sensor.py @@ -3,18 +3,18 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.logi_circle import ( - ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE, DOMAIN as LOGI_CIRCLE_DOMAIN) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, - CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS, - STATE_ON, STATE_OFF) + ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, CONF_ENTITY_NAMESPACE, + CONF_MONITORED_CONDITIONS, STATE_OFF, STATE_ON) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.helpers.icon import icon_for_battery_level from homeassistant.util.dt import as_local +from . import ( + ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE, DOMAIN as LOGI_CIRCLE_DOMAIN) + DEPENDENCIES = ['logi_circle'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/luftdaten/sensor.py b/homeassistant/components/luftdaten/sensor.py index 398ec30a3..107673bac 100644 --- a/homeassistant/components/luftdaten/sensor.py +++ b/homeassistant/components/luftdaten/sensor.py @@ -1,16 +1,17 @@ """Support for Luftdaten sensors.""" import logging -from homeassistant.components.luftdaten import ( - DATA_LUFTDATEN, DATA_LUFTDATEN_CLIENT, DEFAULT_ATTRIBUTION, DOMAIN, - SENSORS, TOPIC_UPDATE) -from homeassistant.components.luftdaten.const import ATTR_SENSOR_ID from homeassistant.const import ( ATTR_ATTRIBUTION, ATTR_LATITUDE, ATTR_LONGITUDE, CONF_SHOW_ON_MAP) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity +from . import ( + DATA_LUFTDATEN, DATA_LUFTDATEN_CLIENT, DEFAULT_ATTRIBUTION, DOMAIN, + SENSORS, TOPIC_UPDATE) +from .const import ATTR_SENSOR_ID + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['luftdaten'] diff --git a/homeassistant/components/lupusec/alarm_control_panel.py b/homeassistant/components/lupusec/alarm_control_panel.py index de62e5bfa..0a88f3bd5 100644 --- a/homeassistant/components/lupusec/alarm_control_panel.py +++ b/homeassistant/components/lupusec/alarm_control_panel.py @@ -2,12 +2,11 @@ from datetime import timedelta from homeassistant.components.alarm_control_panel import AlarmControlPanel -from homeassistant.components.lupusec import DOMAIN as LUPUSEC_DOMAIN -from homeassistant.components.lupusec import LupusecDevice -from homeassistant.const import (STATE_ALARM_ARMED_AWAY, - STATE_ALARM_ARMED_HOME, - STATE_ALARM_DISARMED, - STATE_ALARM_TRIGGERED) +from homeassistant.const import ( + STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, + STATE_ALARM_TRIGGERED) + +from . import DOMAIN as LUPUSEC_DOMAIN, LupusecDevice DEPENDENCIES = ['lupusec'] diff --git a/homeassistant/components/lupusec/binary_sensor.py b/homeassistant/components/lupusec/binary_sensor.py index 8a5e103db..2c3f5e0e0 100644 --- a/homeassistant/components/lupusec/binary_sensor.py +++ b/homeassistant/components/lupusec/binary_sensor.py @@ -1,11 +1,11 @@ """Support for Lupusec Security System binary sensors.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.lupusec import (LupusecDevice, - DOMAIN as LUPUSEC_DOMAIN) -from homeassistant.components.binary_sensor import (BinarySensorDevice, - DEVICE_CLASSES) +from homeassistant.components.binary_sensor import ( + DEVICE_CLASSES, BinarySensorDevice) + +from . import DOMAIN as LUPUSEC_DOMAIN, LupusecDevice DEPENDENCIES = ['lupusec'] diff --git a/homeassistant/components/lupusec/switch.py b/homeassistant/components/lupusec/switch.py index 8a30d65fe..0d86ea0a3 100644 --- a/homeassistant/components/lupusec/switch.py +++ b/homeassistant/components/lupusec/switch.py @@ -1,11 +1,11 @@ """Support for Lupusec Security System switches.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.lupusec import (LupusecDevice, - DOMAIN as LUPUSEC_DOMAIN) from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as LUPUSEC_DOMAIN, LupusecDevice + DEPENDENCIES = ['lupusec'] SCAN_INTERVAL = timedelta(seconds=2) diff --git a/homeassistant/components/lutron/cover.py b/homeassistant/components/lutron/cover.py index cc7a57a55..da7f69095 100644 --- a/homeassistant/components/lutron/cover.py +++ b/homeassistant/components/lutron/cover.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.cover import ( - CoverDevice, SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_SET_POSITION, - ATTR_POSITION) -from homeassistant.components.lutron import ( - LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER) + ATTR_POSITION, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_SET_POSITION, + CoverDevice) + +from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lutron/light.py b/homeassistant/components/lutron/light.py index c0b3b9911..5f3fd4787 100644 --- a/homeassistant/components/lutron/light.py +++ b/homeassistant/components/lutron/light.py @@ -3,8 +3,8 @@ import logging from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) -from homeassistant.components.lutron import ( - LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER) + +from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lutron/scene.py b/homeassistant/components/lutron/scene.py index f9002f2a8..a2d18c6d2 100644 --- a/homeassistant/components/lutron/scene.py +++ b/homeassistant/components/lutron/scene.py @@ -1,10 +1,10 @@ """Support for Lutron scenes.""" import logging -from homeassistant.components.lutron import ( - LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER) from homeassistant.components.scene import Scene +from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['lutron'] diff --git a/homeassistant/components/lutron/switch.py b/homeassistant/components/lutron/switch.py index bfdb06be3..b42c0d930 100644 --- a/homeassistant/components/lutron/switch.py +++ b/homeassistant/components/lutron/switch.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.switch import SwitchDevice -from homeassistant.components.lutron import ( - LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER) + +from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lutron_caseta/cover.py b/homeassistant/components/lutron_caseta/cover.py index 5e09dcc3c..d970f5282 100644 --- a/homeassistant/components/lutron_caseta/cover.py +++ b/homeassistant/components/lutron_caseta/cover.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.cover import ( - CoverDevice, SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_SET_POSITION, - ATTR_POSITION, DOMAIN) -from homeassistant.components.lutron_caseta import ( - LUTRON_CASETA_SMARTBRIDGE, LutronCasetaDevice) + ATTR_POSITION, DOMAIN, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_SET_POSITION, + CoverDevice) + +from . import LUTRON_CASETA_SMARTBRIDGE, LutronCasetaDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lutron_caseta/light.py b/homeassistant/components/lutron_caseta/light.py index 3bab781f3..d883da73c 100644 --- a/homeassistant/components/lutron_caseta/light.py +++ b/homeassistant/components/lutron_caseta/light.py @@ -2,11 +2,11 @@ import logging from homeassistant.components.light import ( - ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light, DOMAIN) + ATTR_BRIGHTNESS, DOMAIN, SUPPORT_BRIGHTNESS, Light) from homeassistant.components.lutron.light import ( to_hass_level, to_lutron_level) -from homeassistant.components.lutron_caseta import ( - LUTRON_CASETA_SMARTBRIDGE, LutronCasetaDevice) + +from . import LUTRON_CASETA_SMARTBRIDGE, LutronCasetaDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/lutron_caseta/scene.py b/homeassistant/components/lutron_caseta/scene.py index c6ca7bad3..2e7059a56 100644 --- a/homeassistant/components/lutron_caseta/scene.py +++ b/homeassistant/components/lutron_caseta/scene.py @@ -1,9 +1,10 @@ """Support for Lutron Caseta scenes.""" import logging -from homeassistant.components.lutron_caseta import LUTRON_CASETA_SMARTBRIDGE from homeassistant.components.scene import Scene +from . import LUTRON_CASETA_SMARTBRIDGE + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['lutron_caseta'] diff --git a/homeassistant/components/lutron_caseta/switch.py b/homeassistant/components/lutron_caseta/switch.py index 0ef059518..54c670913 100644 --- a/homeassistant/components/lutron_caseta/switch.py +++ b/homeassistant/components/lutron_caseta/switch.py @@ -1,9 +1,9 @@ """Support for Lutron Caseta switches.""" import logging -from homeassistant.components.lutron_caseta import ( - LUTRON_CASETA_SMARTBRIDGE, LutronCasetaDevice) -from homeassistant.components.switch import SwitchDevice, DOMAIN +from homeassistant.components.switch import DOMAIN, SwitchDevice + +from . import LUTRON_CASETA_SMARTBRIDGE, LutronCasetaDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/mailgun/notify.py b/homeassistant/components/mailgun/notify.py index 05137254f..b9f5bf0b1 100644 --- a/homeassistant/components/mailgun/notify.py +++ b/homeassistant/components/mailgun/notify.py @@ -3,14 +3,14 @@ import logging import voluptuous as vol -from homeassistant.components.mailgun import ( - CONF_SANDBOX, DOMAIN as MAILGUN_DOMAIN) from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService, ATTR_TITLE, ATTR_TITLE_DEFAULT, - ATTR_DATA) + ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) from homeassistant.const import ( CONF_API_KEY, CONF_DOMAIN, CONF_RECIPIENT, CONF_SENDER) +from . import CONF_SANDBOX, DOMAIN as MAILGUN_DOMAIN + REQUIREMENTS = ['pymailgunner==1.4'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/maxcube/binary_sensor.py b/homeassistant/components/maxcube/binary_sensor.py index 8d5ab84f6..6221b95d8 100644 --- a/homeassistant/components/maxcube/binary_sensor.py +++ b/homeassistant/components/maxcube/binary_sensor.py @@ -2,7 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.maxcube import DATA_KEY + +from . import DATA_KEY _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/maxcube/climate.py b/homeassistant/components/maxcube/climate.py index 170a3ba34..c30ebc7d6 100644 --- a/homeassistant/components/maxcube/climate.py +++ b/homeassistant/components/maxcube/climate.py @@ -1,13 +1,13 @@ """Support for MAX! Thermostats via MAX! Cube.""" -import socket import logging +import socket from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_AUTO, SUPPORT_TARGET_TEMPERATURE, - SUPPORT_OPERATION_MODE) -from homeassistant.components.maxcube import DATA_KEY -from homeassistant.const import TEMP_CELSIUS, ATTR_TEMPERATURE + STATE_AUTO, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) +from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS + +from . import DATA_KEY _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/media_player/demo.py b/homeassistant/components/media_player/demo.py index de455879d..070701f63 100644 --- a/homeassistant/components/media_player/demo.py +++ b/homeassistant/components/media_player/demo.py @@ -4,16 +4,16 @@ Demo implementation of the media player. For more details about this platform, please refer to the documentation https://home-assistant.io/components/demo/ """ +from homeassistant.const import STATE_OFF, STATE_PAUSED, STATE_PLAYING import homeassistant.util.dt as dt_util -from homeassistant.components.media_player import ( - MediaPlayerDevice) -from homeassistant.components.media_player.const import ( + +from . import MediaPlayerDevice +from .const import ( MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, SUPPORT_CLEAR_PLAYLIST, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOUND_MODE, SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET) -from homeassistant.const import STATE_OFF, STATE_PAUSED, STATE_PLAYING def setup_platform(hass, config, add_entities, discovery_info=None): diff --git a/homeassistant/components/melissa/climate.py b/homeassistant/components/melissa/climate.py index b9eb28a61..0df294a14 100644 --- a/homeassistant/components/melissa/climate.py +++ b/homeassistant/components/melissa/climate.py @@ -8,16 +8,15 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, - SUPPORT_ON_OFF, STATE_AUTO, STATE_HEAT, STATE_COOL, STATE_DRY, - STATE_FAN_ONLY, SUPPORT_FAN_MODE -) -from homeassistant.components.fan import SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH -from homeassistant.components.melissa import DATA_MELISSA + STATE_AUTO, STATE_COOL, STATE_DRY, STATE_FAN_ONLY, STATE_HEAT, + SUPPORT_FAN_MODE, SUPPORT_ON_OFF, SUPPORT_OPERATION_MODE, + SUPPORT_TARGET_TEMPERATURE) +from homeassistant.components.fan import SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM from homeassistant.const import ( - TEMP_CELSIUS, STATE_ON, STATE_OFF, STATE_IDLE, ATTR_TEMPERATURE, - PRECISION_WHOLE -) + ATTR_TEMPERATURE, PRECISION_WHOLE, STATE_IDLE, STATE_OFF, STATE_ON, + TEMP_CELSIUS) + +from . import DATA_MELISSA DEPENDENCIES = ['melissa'] diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py index f0ef92679..122b91cae 100644 --- a/homeassistant/components/meteo_france/sensor.py +++ b/homeassistant/components/meteo_france/sensor.py @@ -1,11 +1,11 @@ """Support for Meteo-France raining forecast sensor.""" import logging -from homeassistant.components.meteo_france import ( - ATTRIBUTION, CONF_CITY, DATA_METEO_FRANCE, SENSOR_TYPES) from homeassistant.const import ATTR_ATTRIBUTION, CONF_MONITORED_CONDITIONS from homeassistant.helpers.entity import Entity +from . import ATTRIBUTION, CONF_CITY, DATA_METEO_FRANCE, SENSOR_TYPES + _LOGGER = logging.getLogger(__name__) STATE_ATTR_FORECAST = '1h rain forecast' diff --git a/homeassistant/components/meteo_france/weather.py b/homeassistant/components/meteo_france/weather.py index 849c9d9da..b2b94c762 100644 --- a/homeassistant/components/meteo_france/weather.py +++ b/homeassistant/components/meteo_france/weather.py @@ -2,13 +2,13 @@ from datetime import datetime, timedelta import logging -from homeassistant.components.meteo_france import ( - ATTRIBUTION, CONDITION_CLASSES, CONF_CITY, DATA_METEO_FRANCE) from homeassistant.components.weather import ( ATTR_FORECAST_CONDITION, ATTR_FORECAST_TEMP, ATTR_FORECAST_TEMP_LOW, ATTR_FORECAST_TIME, WeatherEntity) from homeassistant.const import TEMP_CELSIUS +from . import ATTRIBUTION, CONDITION_CLASSES, CONF_CITY, DATA_METEO_FRANCE + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/metoffice/weather.py b/homeassistant/components/metoffice/weather.py index b4984bc3c..a67dcdcdb 100644 --- a/homeassistant/components/metoffice/weather.py +++ b/homeassistant/components/metoffice/weather.py @@ -3,13 +3,13 @@ import logging import voluptuous as vol -from homeassistant.components.metoffice.sensor import ( - CONDITION_CLASSES, ATTRIBUTION, MetOfficeCurrentData) from homeassistant.components.weather import PLATFORM_SCHEMA, WeatherEntity from homeassistant.const import ( CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_CELSIUS) from homeassistant.helpers import config_validation as cv +from .sensor import ATTRIBUTION, CONDITION_CLASSES, MetOfficeCurrentData + REQUIREMENTS = ['datapoint==0.4.3'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py index 4e0ab7444..0c1054845 100644 --- a/homeassistant/components/modbus/binary_sensor.py +++ b/homeassistant/components/modbus/binary_sensor.py @@ -4,12 +4,12 @@ import logging import voluptuous as vol from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.modbus import ( - CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_NAME, CONF_SLAVE from homeassistant.helpers import config_validation as cv +from . import CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN + _LOGGER = logging.getLogger(__name__) CONF_COIL = 'coil' diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index 44daedac9..4d2b86903 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -6,11 +6,11 @@ import voluptuous as vol from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice from homeassistant.components.climate.const import SUPPORT_TARGET_TEMPERATURE -from homeassistant.components.modbus import ( - CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN) from homeassistant.const import ATTR_TEMPERATURE, CONF_NAME, CONF_SLAVE import homeassistant.helpers.config_validation as cv +from . import CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN + _LOGGER = logging.getLogger(__name__) CONF_TARGET_TEMP = 'target_temp_register' diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py index 3f8c68b25..10e11a9a6 100644 --- a/homeassistant/components/modbus/sensor.py +++ b/homeassistant/components/modbus/sensor.py @@ -4,8 +4,6 @@ import struct import voluptuous as vol -from homeassistant.components.modbus import ( - CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( CONF_NAME, CONF_OFFSET, CONF_SLAVE, CONF_STRUCTURE, @@ -13,6 +11,8 @@ from homeassistant.const import ( from homeassistant.helpers import config_validation as cv from homeassistant.helpers.restore_state import RestoreEntity +from . import CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN + _LOGGER = logging.getLogger(__name__) CONF_COUNT = 'count' diff --git a/homeassistant/components/modbus/switch.py b/homeassistant/components/modbus/switch.py index b7039a01d..69c5e3e48 100644 --- a/homeassistant/components/modbus/switch.py +++ b/homeassistant/components/modbus/switch.py @@ -3,8 +3,6 @@ import logging import voluptuous as vol -from homeassistant.components.modbus import ( - CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( CONF_COMMAND_OFF, CONF_COMMAND_ON, CONF_NAME, CONF_SLAVE, STATE_ON) @@ -12,6 +10,8 @@ from homeassistant.helpers import config_validation as cv from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.restore_state import RestoreEntity +from . import CONF_HUB, DEFAULT_HUB, DOMAIN as MODBUS_DOMAIN + _LOGGER = logging.getLogger(__name__) CONF_COIL = 'coil' diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py index e4d468e21..2c605fb4b 100644 --- a/homeassistant/components/mqtt/__init__.py +++ b/homeassistant/components/mqtt/__init__.py @@ -5,8 +5,8 @@ For more details about this component, please refer to the documentation at https://home-assistant.io/components/mqtt/ """ import asyncio -import inspect from functools import partial, wraps +import inspect from itertools import groupby import json import logging @@ -22,6 +22,7 @@ import requests.certs import voluptuous as vol from homeassistant import config_entries +from homeassistant.components import websocket_api from homeassistant.const import ( CONF_DEVICE, CONF_NAME, CONF_PASSWORD, CONF_PAYLOAD, CONF_PORT, CONF_PROTOCOL, CONF_USERNAME, CONF_VALUE_TEMPLATE, @@ -37,7 +38,6 @@ from homeassistant.setup import async_prepare_setup_platform from homeassistant.util.async_ import ( run_callback_threadsafe, run_coroutine_threadsafe) from homeassistant.util.logging import catch_log_exception -from homeassistant.components import websocket_api # Loading the config flow file will register the flow from . import config_flow # noqa pylint: disable=unused-import @@ -1012,7 +1012,7 @@ class MqttDiscoveryUpdate(Entity): await super().async_added_to_hass() from homeassistant.helpers.dispatcher import async_dispatcher_connect - from homeassistant.components.mqtt.discovery import ( + from .discovery import ( MQTT_DISCOVERY_UPDATED, clear_discovery_hash) @callback diff --git a/homeassistant/components/mqtt/alarm_control_panel.py b/homeassistant/components/mqtt/alarm_control_panel.py index c350b32b4..9498b5975 100644 --- a/homeassistant/components/mqtt/alarm_control_panel.py +++ b/homeassistant/components/mqtt/alarm_control_panel.py @@ -11,12 +11,6 @@ import voluptuous as vol from homeassistant.components import mqtt import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, - CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, - MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import ( CONF_CODE, CONF_DEVICE, CONF_NAME, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED, @@ -26,6 +20,12 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, + CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, + MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) CONF_CODE_ARM_REQUIRED = 'code_arm_required' diff --git a/homeassistant/components/mqtt/binary_sensor.py b/homeassistant/components/mqtt/binary_sensor.py index f2a93d06f..7532f3053 100644 --- a/homeassistant/components/mqtt/binary_sensor.py +++ b/homeassistant/components/mqtt/binary_sensor.py @@ -11,12 +11,6 @@ import voluptuous as vol from homeassistant.components import binary_sensor, mqtt from homeassistant.components.binary_sensor import ( DEVICE_CLASSES_SCHEMA, BinarySensorDevice) -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_QOS, CONF_STATE_TOPIC, CONF_UNIQUE_ID, - MqttAttributes, MqttAvailability, MqttDiscoveryUpdate, - MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import ( CONF_DEVICE, CONF_DEVICE_CLASS, CONF_FORCE_UPDATE, CONF_NAME, CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, CONF_VALUE_TEMPLATE) @@ -26,6 +20,12 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect import homeassistant.helpers.event as evt from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_QOS, CONF_STATE_TOPIC, CONF_UNIQUE_ID, + MqttAttributes, MqttAvailability, MqttDiscoveryUpdate, + MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) DEFAULT_NAME = 'MQTT Binary sensor' diff --git a/homeassistant/components/mqtt/camera.py b/homeassistant/components/mqtt/camera.py index ca41f3c42..889e55334 100644 --- a/homeassistant/components/mqtt/camera.py +++ b/homeassistant/components/mqtt/camera.py @@ -12,17 +12,17 @@ import voluptuous as vol from homeassistant.components import camera, mqtt from homeassistant.components.camera import PLATFORM_SCHEMA, Camera -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttDiscoveryUpdate, - subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import CONF_NAME from homeassistant.core import callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttDiscoveryUpdate, + subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) CONF_TOPIC = 'topic' diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py index ae8474379..a9c23d27e 100644 --- a/homeassistant/components/mqtt/climate.py +++ b/homeassistant/components/mqtt/climate.py @@ -10,20 +10,13 @@ import voluptuous as vol from homeassistant.components import climate, mqtt from homeassistant.components.climate import ( - ClimateDevice, PLATFORM_SCHEMA as CLIMATE_PLATFORM_SCHEMA) + PLATFORM_SCHEMA as CLIMATE_PLATFORM_SCHEMA, ClimateDevice) from homeassistant.components.climate.const import ( - ATTR_OPERATION_MODE, DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP, - STATE_AUTO, STATE_COOL, - STATE_DRY, STATE_FAN_ONLY, STATE_HEAT, SUPPORT_AUX_HEAT, SUPPORT_AWAY_MODE, - SUPPORT_FAN_MODE, SUPPORT_HOLD_MODE, SUPPORT_OPERATION_MODE, - SUPPORT_SWING_MODE, SUPPORT_TARGET_TEMPERATURE) + ATTR_OPERATION_MODE, DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP, STATE_AUTO, + STATE_COOL, STATE_DRY, STATE_FAN_ONLY, STATE_HEAT, SUPPORT_AUX_HEAT, + SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE, SUPPORT_HOLD_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.components.fan import SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_QOS, CONF_RETAIN, CONF_STATE_TOPIC, - CONF_UNIQUE_ID, MQTT_BASE_PLATFORM_SCHEMA, MqttAttributes, - MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import ( ATTR_TEMPERATURE, CONF_DEVICE, CONF_NAME, CONF_VALUE_TEMPLATE, STATE_OFF, STATE_ON) @@ -32,6 +25,12 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_QOS, CONF_RETAIN, CONF_STATE_TOPIC, + CONF_UNIQUE_ID, MQTT_BASE_PLATFORM_SCHEMA, MqttAttributes, + MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['mqtt'] diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py index 37222cbe8..8116421ac 100644 --- a/homeassistant/components/mqtt/cover.py +++ b/homeassistant/components/mqtt/cover.py @@ -13,12 +13,6 @@ from homeassistant.components.cover import ( ATTR_POSITION, ATTR_TILT_POSITION, DEVICE_CLASSES_SCHEMA, SUPPORT_CLOSE, SUPPORT_CLOSE_TILT, SUPPORT_OPEN, SUPPORT_OPEN_TILT, SUPPORT_SET_POSITION, SUPPORT_SET_TILT_POSITION, SUPPORT_STOP, SUPPORT_STOP_TILT, CoverDevice) -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, - CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, - MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import ( CONF_DEVICE, CONF_DEVICE_CLASS, CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE, STATE_CLOSED, STATE_OPEN, STATE_UNKNOWN) @@ -28,6 +22,12 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, + CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, + MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['mqtt'] diff --git a/homeassistant/components/mqtt/device_tracker.py b/homeassistant/components/mqtt/device_tracker.py index bf55d955c..0f22ed150 100644 --- a/homeassistant/components/mqtt/device_tracker.py +++ b/homeassistant/components/mqtt/device_tracker.py @@ -9,12 +9,13 @@ import logging import voluptuous as vol from homeassistant.components import mqtt -from homeassistant.core import callback -from homeassistant.const import CONF_DEVICES -from homeassistant.components.mqtt import CONF_QOS from homeassistant.components.device_tracker import PLATFORM_SCHEMA +from homeassistant.const import CONF_DEVICES +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from . import CONF_QOS + DEPENDENCIES = ['mqtt'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py index 745e54d0e..cb87a208b 100644 --- a/homeassistant/components/mqtt/discovery.py +++ b/homeassistant/components/mqtt/discovery.py @@ -10,12 +10,13 @@ import logging import re from homeassistant.components import mqtt -from homeassistant.components.mqtt import ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC from homeassistant.const import CONF_DEVICE, CONF_PLATFORM from homeassistant.helpers.discovery import async_load_platform from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.typing import HomeAssistantType +from . import ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC + _LOGGER = logging.getLogger(__name__) TOPIC_MATCHER = re.compile( diff --git a/homeassistant/components/mqtt/fan.py b/homeassistant/components/mqtt/fan.py index 7c9f816ef..b8bff6088 100644 --- a/homeassistant/components/mqtt/fan.py +++ b/homeassistant/components/mqtt/fan.py @@ -12,12 +12,6 @@ from homeassistant.components import fan, mqtt from homeassistant.components.fan import ( ATTR_SPEED, SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SPEED_OFF, SUPPORT_OSCILLATE, SUPPORT_SET_SPEED, FanEntity) -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, - CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, - MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import ( CONF_DEVICE, CONF_NAME, CONF_OPTIMISTIC, CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, CONF_STATE, STATE_OFF, STATE_ON) @@ -26,6 +20,12 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, + CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, + MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['mqtt'] diff --git a/homeassistant/components/mqtt/lock.py b/homeassistant/components/mqtt/lock.py index d9adc37d7..ee459d217 100644 --- a/homeassistant/components/mqtt/lock.py +++ b/homeassistant/components/mqtt/lock.py @@ -10,12 +10,6 @@ import voluptuous as vol from homeassistant.components import lock, mqtt from homeassistant.components.lock import LockDevice -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, - CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, - MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.const import ( CONF_DEVICE, CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE) from homeassistant.core import callback @@ -23,6 +17,12 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, + CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, + MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) CONF_PAYLOAD_LOCK = 'payload_lock' diff --git a/homeassistant/components/mqtt/sensor.py b/homeassistant/components/mqtt/sensor.py index c6ef3344f..aa8d5e2a3 100644 --- a/homeassistant/components/mqtt/sensor.py +++ b/homeassistant/components/mqtt/sensor.py @@ -12,12 +12,6 @@ from typing import Optional import voluptuous as vol from homeassistant.components import mqtt, sensor -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_QOS, CONF_STATE_TOPIC, CONF_UNIQUE_ID, - MqttAttributes, MqttAvailability, MqttDiscoveryUpdate, - MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.components.sensor import DEVICE_CLASSES_SCHEMA from homeassistant.const import ( CONF_DEVICE, CONF_DEVICE_CLASS, CONF_FORCE_UPDATE, CONF_ICON, CONF_NAME, @@ -30,6 +24,12 @@ from homeassistant.helpers.event import async_track_point_in_utc_time from homeassistant.helpers.typing import ConfigType, HomeAssistantType from homeassistant.util import dt as dt_util +from . import ( + ATTR_DISCOVERY_HASH, CONF_QOS, CONF_STATE_TOPIC, CONF_UNIQUE_ID, + MqttAttributes, MqttAvailability, MqttDiscoveryUpdate, + MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) CONF_EXPIRE_AFTER = 'expire_after' diff --git a/homeassistant/components/mqtt/subscription.py b/homeassistant/components/mqtt/subscription.py index e4563fc37..e159132d5 100644 --- a/homeassistant/components/mqtt/subscription.py +++ b/homeassistant/components/mqtt/subscription.py @@ -10,10 +10,11 @@ from typing import Any, Callable, Dict, Optional import attr from homeassistant.components import mqtt -from homeassistant.components.mqtt import DEFAULT_QOS, MessageCallbackType from homeassistant.helpers.typing import HomeAssistantType from homeassistant.loader import bind_hass +from . import DEFAULT_QOS, MessageCallbackType + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/mqtt/switch.py b/homeassistant/components/mqtt/switch.py index de7da6b72..4847afd80 100644 --- a/homeassistant/components/mqtt/switch.py +++ b/homeassistant/components/mqtt/switch.py @@ -9,12 +9,6 @@ import logging import voluptuous as vol from homeassistant.components import mqtt, switch -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, - CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, - MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.components.switch import SwitchDevice from homeassistant.const import ( CONF_DEVICE, CONF_ICON, CONF_NAME, CONF_OPTIMISTIC, CONF_PAYLOAD_OFF, @@ -25,6 +19,12 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.restore_state import RestoreEntity from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from . import ( + ATTR_DISCOVERY_HASH, CONF_COMMAND_TOPIC, CONF_QOS, CONF_RETAIN, + CONF_STATE_TOPIC, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, + MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['mqtt'] diff --git a/homeassistant/components/mqtt/vacuum.py b/homeassistant/components/mqtt/vacuum.py index eb7e78b62..efa00821c 100644 --- a/homeassistant/components/mqtt/vacuum.py +++ b/homeassistant/components/mqtt/vacuum.py @@ -9,11 +9,6 @@ import logging import voluptuous as vol from homeassistant.components import mqtt -from homeassistant.components.mqtt import ( - ATTR_DISCOVERY_HASH, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, - MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) -from homeassistant.components.mqtt.discovery import ( - MQTT_DISCOVERY_NEW, clear_discovery_hash) from homeassistant.components.vacuum import ( DOMAIN, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED, SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, SUPPORT_SEND_COMMAND, @@ -25,6 +20,11 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.icon import icon_for_battery_level +from . import ( + ATTR_DISCOVERY_HASH, CONF_UNIQUE_ID, MqttAttributes, MqttAvailability, + MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription) +from .discovery import MQTT_DISCOVERY_NEW, clear_discovery_hash + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['mqtt'] diff --git a/homeassistant/components/mychevy/binary_sensor.py b/homeassistant/components/mychevy/binary_sensor.py index 67f12a143..a2435d596 100644 --- a/homeassistant/components/mychevy/binary_sensor.py +++ b/homeassistant/components/mychevy/binary_sensor.py @@ -1,14 +1,13 @@ """Support for MyChevy binary sensors.""" import logging -from homeassistant.components.mychevy import ( - EVBinarySensorConfig, DOMAIN as MYCHEVY_DOMAIN, UPDATE_TOPIC -) from homeassistant.components.binary_sensor import ( ENTITY_ID_FORMAT, BinarySensorDevice) from homeassistant.core import callback from homeassistant.util import slugify +from . import DOMAIN as MYCHEVY_DOMAIN, UPDATE_TOPIC, EVBinarySensorConfig + _LOGGER = logging.getLogger(__name__) SENSORS = [ diff --git a/homeassistant/components/mychevy/sensor.py b/homeassistant/components/mychevy/sensor.py index c7d140e0c..42b27df62 100644 --- a/homeassistant/components/mychevy/sensor.py +++ b/homeassistant/components/mychevy/sensor.py @@ -1,16 +1,16 @@ """Support for MyChevy sensors.""" import logging -from homeassistant.components.mychevy import ( - EVSensorConfig, DOMAIN as MYCHEVY_DOMAIN, MYCHEVY_ERROR, MYCHEVY_SUCCESS, - UPDATE_TOPIC, ERROR_TOPIC -) from homeassistant.components.sensor import ENTITY_ID_FORMAT from homeassistant.core import callback from homeassistant.helpers.entity import Entity from homeassistant.helpers.icon import icon_for_battery_level from homeassistant.util import slugify +from . import ( + DOMAIN as MYCHEVY_DOMAIN, ERROR_TOPIC, MYCHEVY_ERROR, MYCHEVY_SUCCESS, + UPDATE_TOPIC, EVSensorConfig) + _LOGGER = logging.getLogger(__name__) BATTERY_SENSOR = "batteryLevel" diff --git a/homeassistant/components/neato/camera.py b/homeassistant/components/neato/camera.py index 530aa8fc6..f8106c3e6 100644 --- a/homeassistant/components/neato/camera.py +++ b/homeassistant/components/neato/camera.py @@ -1,10 +1,10 @@ """Support for loading picture from Neato.""" +from datetime import timedelta import logging -from datetime import timedelta from homeassistant.components.camera import Camera -from homeassistant.components.neato import ( - NEATO_MAP_DATA, NEATO_ROBOTS, NEATO_LOGIN) + +from . import NEATO_LOGIN, NEATO_MAP_DATA, NEATO_ROBOTS _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/neato/switch.py b/homeassistant/components/neato/switch.py index fcc72762b..ea60f9492 100644 --- a/homeassistant/components/neato/switch.py +++ b/homeassistant/components/neato/switch.py @@ -1,10 +1,13 @@ """Support for Neato Connected Vacuums switches.""" -import logging from datetime import timedelta +import logging + import requests + from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.helpers.entity import ToggleEntity -from homeassistant.components.neato import NEATO_ROBOTS, NEATO_LOGIN + +from . import NEATO_LOGIN, NEATO_ROBOTS _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/neato/vacuum.py b/homeassistant/components/neato/vacuum.py index 2f2f39049..3575301ea 100644 --- a/homeassistant/components/neato/vacuum.py +++ b/homeassistant/components/neato/vacuum.py @@ -1,22 +1,23 @@ """Support for Neato Connected Vacuums.""" -import logging from datetime import timedelta +import logging + import requests import voluptuous as vol -from homeassistant.const import (ATTR_ENTITY_ID) from homeassistant.components.vacuum import ( - StateVacuumDevice, SUPPORT_BATTERY, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, - SUPPORT_STATE, SUPPORT_STOP, SUPPORT_START, STATE_IDLE, - STATE_PAUSED, STATE_CLEANING, STATE_DOCKED, STATE_RETURNING, STATE_ERROR, - SUPPORT_MAP, ATTR_STATUS, ATTR_BATTERY_LEVEL, ATTR_BATTERY_ICON, - SUPPORT_LOCATE, SUPPORT_CLEAN_SPOT, DOMAIN) -from homeassistant.components.neato import ( - NEATO_ROBOTS, NEATO_LOGIN, NEATO_MAP_DATA, ACTION, ERRORS, MODE, ALERTS, - NEATO_PERSISTENT_MAPS) - -from homeassistant.helpers.service import extract_entity_ids + ATTR_BATTERY_ICON, ATTR_BATTERY_LEVEL, ATTR_STATUS, DOMAIN, STATE_CLEANING, + STATE_DOCKED, STATE_ERROR, STATE_IDLE, STATE_PAUSED, STATE_RETURNING, + SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_LOCATE, SUPPORT_MAP, + SUPPORT_PAUSE, SUPPORT_RETURN_HOME, SUPPORT_START, SUPPORT_STATE, + SUPPORT_STOP, StateVacuumDevice) +from homeassistant.const import ATTR_ENTITY_ID import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.service import extract_entity_ids + +from . import ( + ACTION, ALERTS, ERRORS, MODE, NEATO_LOGIN, NEATO_MAP_DATA, + NEATO_PERSISTENT_MAPS, NEATO_ROBOTS) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ness_alarm/alarm_control_panel.py b/homeassistant/components/ness_alarm/alarm_control_panel.py index ee3a0c213..f77b53498 100644 --- a/homeassistant/components/ness_alarm/alarm_control_panel.py +++ b/homeassistant/components/ness_alarm/alarm_control_panel.py @@ -8,14 +8,14 @@ https://home-assistant.io/components/alarm_control_panel.ness_alarm/ import logging import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.ness_alarm import ( - DATA_NESS, SIGNAL_ARMING_STATE_CHANGED) from homeassistant.const import ( - STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMING, - STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING, STATE_ALARM_DISARMED) + STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMING, STATE_ALARM_DISARMED, + STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import DATA_NESS, SIGNAL_ARMING_STATE_CHANGED + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['ness_alarm'] diff --git a/homeassistant/components/ness_alarm/binary_sensor.py b/homeassistant/components/ness_alarm/binary_sensor.py index 9f1479efd..7b684f74a 100644 --- a/homeassistant/components/ness_alarm/binary_sensor.py +++ b/homeassistant/components/ness_alarm/binary_sensor.py @@ -7,12 +7,13 @@ https://home-assistant.io/components/binary_sensor.ness_alarm/ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.ness_alarm import ( - CONF_ZONES, CONF_ZONE_TYPE, CONF_ZONE_NAME, CONF_ZONE_ID, - SIGNAL_ZONE_CHANGED, ZoneChangedData) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import ( + CONF_ZONE_ID, CONF_ZONE_NAME, CONF_ZONE_TYPE, CONF_ZONES, + SIGNAL_ZONE_CHANGED, ZoneChangedData) + DEPENDENCIES = ['ness_alarm'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/nest/binary_sensor.py b/homeassistant/components/nest/binary_sensor.py index 1077fdb07..aa56bfbf2 100644 --- a/homeassistant/components/nest/binary_sensor.py +++ b/homeassistant/components/nest/binary_sensor.py @@ -3,10 +3,11 @@ from itertools import chain import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.nest import ( - DATA_NEST, DATA_NEST_CONFIG, CONF_BINARY_SENSORS, NestSensorDevice) from homeassistant.const import CONF_MONITORED_CONDITIONS +from . import ( + CONF_BINARY_SENSORS, DATA_NEST, DATA_NEST_CONFIG, NestSensorDevice) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['nest'] diff --git a/homeassistant/components/nest/climate.py b/homeassistant/components/nest/climate.py index 88b6cbbbe..cd9a7cb71 100644 --- a/homeassistant/components/nest/climate.py +++ b/homeassistant/components/nest/climate.py @@ -3,20 +3,19 @@ import logging import voluptuous as vol -from homeassistant.components.nest import ( - DATA_NEST, SIGNAL_NEST_UPDATE, DOMAIN as NEST_DOMAIN) -from homeassistant.components.climate import ClimateDevice, PLATFORM_SCHEMA +from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice from homeassistant.components.climate.const import ( - STATE_AUTO, STATE_COOL, STATE_HEAT, STATE_ECO, - ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, - SUPPORT_TARGET_TEMPERATURE, - SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW, - SUPPORT_OPERATION_MODE, SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE) + ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, STATE_AUTO, STATE_COOL, + STATE_ECO, STATE_HEAT, SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, + SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW) from homeassistant.const import ( - ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT, - CONF_SCAN_INTERVAL, STATE_ON, STATE_OFF) + ATTR_TEMPERATURE, CONF_SCAN_INTERVAL, STATE_OFF, STATE_ON, TEMP_CELSIUS, + TEMP_FAHRENHEIT) from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import DATA_NEST, DOMAIN as NEST_DOMAIN, SIGNAL_NEST_UPDATE + DEPENDENCIES = ['nest'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/nest/sensor.py b/homeassistant/components/nest/sensor.py index bde3f681c..ecae83e30 100644 --- a/homeassistant/components/nest/sensor.py +++ b/homeassistant/components/nest/sensor.py @@ -1,13 +1,12 @@ """Support for Nest Thermostat sensors.""" import logging -from homeassistant.components.climate.const import ( - STATE_COOL, STATE_HEAT) -from homeassistant.components.nest import ( - DATA_NEST, DATA_NEST_CONFIG, CONF_SENSORS, NestSensorDevice) +from homeassistant.components.climate.const import STATE_COOL, STATE_HEAT from homeassistant.const import ( - TEMP_CELSIUS, TEMP_FAHRENHEIT, CONF_MONITORED_CONDITIONS, - DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, STATE_OFF) + CONF_MONITORED_CONDITIONS, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, + STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT) + +from . import CONF_SENSORS, DATA_NEST, DATA_NEST_CONFIG, NestSensorDevice DEPENDENCIES = ['nest'] diff --git a/homeassistant/components/netatmo/binary_sensor.py b/homeassistant/components/netatmo/binary_sensor.py index 7986010ef..a11ce6bdd 100644 --- a/homeassistant/components/netatmo/binary_sensor.py +++ b/homeassistant/components/netatmo/binary_sensor.py @@ -4,11 +4,12 @@ import logging import voluptuous as vol from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) -from homeassistant.components.netatmo import CameraData + PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import CONF_TIMEOUT from homeassistant.helpers import config_validation as cv +from . import CameraData + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['netatmo'] diff --git a/homeassistant/components/netatmo/camera.py b/homeassistant/components/netatmo/camera.py index 57d30d6cb..513852cde 100644 --- a/homeassistant/components/netatmo/camera.py +++ b/homeassistant/components/netatmo/camera.py @@ -4,11 +4,12 @@ import logging import requests import voluptuous as vol +from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.const import CONF_VERIFY_SSL -from homeassistant.components.netatmo import CameraData -from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA) from homeassistant.helpers import config_validation as cv +from . import CameraData + DEPENDENCIES = ['netatmo'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/nissan_leaf/binary_sensor.py b/homeassistant/components/nissan_leaf/binary_sensor.py index 2397405ec..5c71cf1fc 100644 --- a/homeassistant/components/nissan_leaf/binary_sensor.py +++ b/homeassistant/components/nissan_leaf/binary_sensor.py @@ -1,10 +1,10 @@ """Plugged In Status Support for the Nissan Leaf.""" import logging -from homeassistant.components.nissan_leaf import ( - DATA_CHARGING, DATA_LEAF, DATA_PLUGGED_IN, LeafEntity) from homeassistant.components.binary_sensor import BinarySensorDevice +from . import DATA_CHARGING, DATA_LEAF, DATA_PLUGGED_IN, LeafEntity + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['nissan_leaf'] diff --git a/homeassistant/components/nissan_leaf/device_tracker.py b/homeassistant/components/nissan_leaf/device_tracker.py index 1ca7fceb9..95f6fcdca 100644 --- a/homeassistant/components/nissan_leaf/device_tracker.py +++ b/homeassistant/components/nissan_leaf/device_tracker.py @@ -1,11 +1,11 @@ """Support for tracking a Nissan Leaf.""" import logging -from homeassistant.components.nissan_leaf import ( - DATA_LEAF, DATA_LOCATION, SIGNAL_UPDATE_LEAF) from homeassistant.helpers.dispatcher import dispatcher_connect from homeassistant.util import slugify +from . import DATA_LEAF, DATA_LOCATION, SIGNAL_UPDATE_LEAF + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['nissan_leaf'] diff --git a/homeassistant/components/nissan_leaf/sensor.py b/homeassistant/components/nissan_leaf/sensor.py index f6206f1f4..682f482b4 100644 --- a/homeassistant/components/nissan_leaf/sensor.py +++ b/homeassistant/components/nissan_leaf/sensor.py @@ -1,14 +1,15 @@ """Battery Charge and Range Support for the Nissan Leaf.""" import logging -from homeassistant.components.nissan_leaf import ( - DATA_BATTERY, DATA_CHARGING, DATA_LEAF, DATA_RANGE_AC, DATA_RANGE_AC_OFF, - LeafEntity) from homeassistant.const import DEVICE_CLASS_BATTERY from homeassistant.helpers.icon import icon_for_battery_level from homeassistant.util.distance import LENGTH_KILOMETERS, LENGTH_MILES from homeassistant.util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM +from . import ( + DATA_BATTERY, DATA_CHARGING, DATA_LEAF, DATA_RANGE_AC, DATA_RANGE_AC_OFF, + LeafEntity) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['nissan_leaf'] diff --git a/homeassistant/components/nissan_leaf/switch.py b/homeassistant/components/nissan_leaf/switch.py index 60b9a6630..e6d72103a 100644 --- a/homeassistant/components/nissan_leaf/switch.py +++ b/homeassistant/components/nissan_leaf/switch.py @@ -1,10 +1,10 @@ """Charge and Climate Control Support for the Nissan Leaf.""" import logging -from homeassistant.components.nissan_leaf import ( - DATA_CLIMATE, DATA_LEAF, LeafEntity) from homeassistant.helpers.entity import ToggleEntity +from . import DATA_CLIMATE, DATA_LEAF, LeafEntity + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['nissan_leaf'] diff --git a/homeassistant/components/notify/apns.py b/homeassistant/components/notify/apns.py index 8fabfc3ae..3f5403f0c 100644 --- a/homeassistant/components/notify/apns.py +++ b/homeassistant/components/notify/apns.py @@ -9,13 +9,14 @@ import os import voluptuous as vol -from homeassistant.helpers.event import track_state_change from homeassistant.config import load_yaml_config_file -from homeassistant.components.notify import ( - ATTR_TARGET, ATTR_DATA, BaseNotificationService, DOMAIN, PLATFORM_SCHEMA) -from homeassistant.const import CONF_NAME, CONF_PLATFORM, ATTR_NAME -import homeassistant.helpers.config_validation as cv +from homeassistant.const import ATTR_NAME, CONF_NAME, CONF_PLATFORM from homeassistant.helpers import template as template_helper +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.event import track_state_change + +from . import ( + ATTR_DATA, ATTR_TARGET, DOMAIN, PLATFORM_SCHEMA, BaseNotificationService) REQUIREMENTS = ['apns2==0.3.0'] diff --git a/homeassistant/components/notify/aws_lambda.py b/homeassistant/components/notify/aws_lambda.py index 17df1ba8f..e605f82c3 100644 --- a/homeassistant/components/notify/aws_lambda.py +++ b/homeassistant/components/notify/aws_lambda.py @@ -4,19 +4,18 @@ AWS Lambda platform for notify component. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.aws_lambda/ """ -import logging -import json import base64 +import json +import logging import voluptuous as vol -from homeassistant.const import ( - CONF_PLATFORM, CONF_NAME) -from homeassistant.components.notify import ( - ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) +from homeassistant.const import CONF_NAME, CONF_PLATFORM import homeassistant.helpers.config_validation as cv from homeassistant.helpers.json import JSONEncoder +from . import ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService + REQUIREMENTS = ['boto3==1.9.16'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/aws_sns.py b/homeassistant/components/notify/aws_sns.py index 065898bcb..9363576fc 100644 --- a/homeassistant/components/notify/aws_sns.py +++ b/homeassistant/components/notify/aws_sns.py @@ -4,18 +4,18 @@ AWS SNS platform for notify component. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.aws_sns/ """ -import logging import json +import logging import voluptuous as vol -from homeassistant.const import ( - CONF_PLATFORM, CONF_NAME) -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_TARGET, PLATFORM_SCHEMA, - BaseNotificationService) +from homeassistant.const import CONF_NAME, CONF_PLATFORM import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ["boto3==1.9.16"] diff --git a/homeassistant/components/notify/aws_sqs.py b/homeassistant/components/notify/aws_sqs.py index 78e71bde9..ed22147cf 100644 --- a/homeassistant/components/notify/aws_sqs.py +++ b/homeassistant/components/notify/aws_sqs.py @@ -4,17 +4,16 @@ AWS SQS platform for notify component. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.aws_sqs/ """ -import logging import json +import logging import voluptuous as vol -from homeassistant.const import ( - CONF_PLATFORM, CONF_NAME) -from homeassistant.components.notify import ( - ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) +from homeassistant.const import CONF_NAME, CONF_PLATFORM import homeassistant.helpers.config_validation as cv +from . import ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService + _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ["boto3==1.9.16"] diff --git a/homeassistant/components/notify/ciscospark.py b/homeassistant/components/notify/ciscospark.py index e83e0e902..a33e9432e 100644 --- a/homeassistant/components/notify/ciscospark.py +++ b/homeassistant/components/notify/ciscospark.py @@ -8,11 +8,11 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService, ATTR_TITLE) -from homeassistant.const import (CONF_TOKEN) +from homeassistant.const import CONF_TOKEN import homeassistant.helpers.config_validation as cv +from . import ATTR_TITLE, PLATFORM_SCHEMA, BaseNotificationService + REQUIREMENTS = ['ciscosparkapi==0.4.2'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/clickatell.py b/homeassistant/components/notify/clickatell.py index 6af2b4551..559232e25 100644 --- a/homeassistant/components/notify/clickatell.py +++ b/homeassistant/components/notify/clickatell.py @@ -9,10 +9,10 @@ import logging import requests import voluptuous as vol +from homeassistant.const import CONF_API_KEY, CONF_RECIPIENT import homeassistant.helpers.config_validation as cv -from homeassistant.const import (CONF_API_KEY, CONF_RECIPIENT) -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) + +from . import PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/clicksend.py b/homeassistant/components/notify/clicksend.py index faf30ac7c..6f10ac707 100644 --- a/homeassistant/components/notify/clicksend.py +++ b/homeassistant/components/notify/clicksend.py @@ -7,16 +7,16 @@ https://home-assistant.io/components/notify.clicksend/ import json import logging +from aiohttp.hdrs import CONTENT_TYPE import requests import voluptuous as vol -from aiohttp.hdrs import CONTENT_TYPE -import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import ( CONF_API_KEY, CONF_RECIPIENT, CONF_SENDER, CONF_USERNAME, CONTENT_TYPE_JSON) +import homeassistant.helpers.config_validation as cv + +from . import PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/clicksend_tts.py b/homeassistant/components/notify/clicksend_tts.py index c60e02ece..1481fea17 100644 --- a/homeassistant/components/notify/clicksend_tts.py +++ b/homeassistant/components/notify/clicksend_tts.py @@ -9,15 +9,15 @@ https://home-assistant.io/components/notify.clicksend_tts/ import json import logging +from aiohttp.hdrs import CONTENT_TYPE import requests import voluptuous as vol -from aiohttp.hdrs import CONTENT_TYPE -import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import ( - CONF_API_KEY, CONF_USERNAME, CONF_RECIPIENT, CONTENT_TYPE_JSON) + CONF_API_KEY, CONF_RECIPIENT, CONF_USERNAME, CONTENT_TYPE_JSON) +import homeassistant.helpers.config_validation as cv + +from . import PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/command_line.py b/homeassistant/components/notify/command_line.py index 4a7483d6e..6a81dace2 100644 --- a/homeassistant/components/notify/command_line.py +++ b/homeassistant/components/notify/command_line.py @@ -9,11 +9,11 @@ import subprocess import voluptuous as vol -from homeassistant.const import (CONF_COMMAND, CONF_NAME) -from homeassistant.components.notify import ( - BaseNotificationService, PLATFORM_SCHEMA) +from homeassistant.const import CONF_COMMAND, CONF_NAME import homeassistant.helpers.config_validation as cv +from . import PLATFORM_SCHEMA, BaseNotificationService + _LOGGER = logging.getLogger(__name__) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ diff --git a/homeassistant/components/notify/demo.py b/homeassistant/components/notify/demo.py index 5b8e1f168..9cb616090 100644 --- a/homeassistant/components/notify/demo.py +++ b/homeassistant/components/notify/demo.py @@ -4,7 +4,7 @@ Demo notification service. For more details about this platform, please refer to the documentation https://home-assistant.io/components/demo/ """ -from homeassistant.components.notify import BaseNotificationService +from . import BaseNotificationService EVENT_NOTIFY = "notify" diff --git a/homeassistant/components/notify/discord.py b/homeassistant/components/notify/discord.py index e9f0d5cec..f98c136b3 100644 --- a/homeassistant/components/notify/discord.py +++ b/homeassistant/components/notify/discord.py @@ -8,10 +8,10 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService, ATTR_TARGET, ATTR_DATA) from homeassistant.const import CONF_TOKEN +import homeassistant.helpers.config_validation as cv + +from . import ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/facebook.py b/homeassistant/components/notify/facebook.py index b73f845ea..b642a7b93 100644 --- a/homeassistant/components/notify/facebook.py +++ b/homeassistant/components/notify/facebook.py @@ -11,11 +11,11 @@ from aiohttp.hdrs import CONTENT_TYPE import requests import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONTENT_TYPE_JSON import homeassistant.helpers.config_validation as cv +from . import ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService + _LOGGER = logging.getLogger(__name__) CONF_PAGE_ACCESS_TOKEN = 'page_access_token' diff --git a/homeassistant/components/notify/file.py b/homeassistant/components/notify/file.py index 749a6d4b3..98f6da66e 100644 --- a/homeassistant/components/notify/file.py +++ b/homeassistant/components/notify/file.py @@ -9,11 +9,12 @@ import os import voluptuous as vol -import homeassistant.util.dt as dt_util -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_FILENAME import homeassistant.helpers.config_validation as cv +import homeassistant.util.dt as dt_util + +from . import ( + ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) CONF_TIMESTAMP = 'timestamp' diff --git a/homeassistant/components/notify/flock.py b/homeassistant/components/notify/flock.py index d26f62980..16f38bbbb 100644 --- a/homeassistant/components/notify/flock.py +++ b/homeassistant/components/notify/flock.py @@ -10,12 +10,12 @@ import logging import async_timeout import voluptuous as vol -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv +from . import PLATFORM_SCHEMA, BaseNotificationService + _LOGGER = logging.getLogger(__name__) _RESOURCE = 'https://api.flock.com/hooks/sendMessage/' diff --git a/homeassistant/components/notify/free_mobile.py b/homeassistant/components/notify/free_mobile.py index a27d04951..fb7829105 100644 --- a/homeassistant/components/notify/free_mobile.py +++ b/homeassistant/components/notify/free_mobile.py @@ -8,11 +8,11 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME import homeassistant.helpers.config_validation as cv +from . import PLATFORM_SCHEMA, BaseNotificationService + REQUIREMENTS = ['freesms==0.1.2'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/gntp.py b/homeassistant/components/notify/gntp.py index 1a2b65f95..4560eb21f 100644 --- a/homeassistant/components/notify/gntp.py +++ b/homeassistant/components/notify/gntp.py @@ -9,11 +9,12 @@ import os import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_PASSWORD, CONF_PORT import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) + REQUIREMENTS = ['gntp==1.0.3'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/group.py b/homeassistant/components/notify/group.py index 5d25c2d81..85d4d53e3 100644 --- a/homeassistant/components/notify/group.py +++ b/homeassistant/components/notify/group.py @@ -8,13 +8,15 @@ import asyncio from collections.abc import Mapping from copy import deepcopy import logging + import voluptuous as vol from homeassistant.const import ATTR_SERVICE -from homeassistant.components.notify import ( - DOMAIN, ATTR_MESSAGE, ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_DATA, ATTR_MESSAGE, DOMAIN, PLATFORM_SCHEMA, BaseNotificationService) + _LOGGER = logging.getLogger(__name__) CONF_SERVICES = 'services' diff --git a/homeassistant/components/notify/hipchat.py b/homeassistant/components/notify/hipchat.py index 344827c00..8ce7b8b12 100644 --- a/homeassistant/components/notify/hipchat.py +++ b/homeassistant/components/notify/hipchat.py @@ -8,10 +8,10 @@ import logging import voluptuous as vol +from homeassistant.const import CONF_HOST, CONF_ROOM, CONF_TOKEN import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TARGET, ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) -from homeassistant.const import CONF_TOKEN, CONF_HOST, CONF_ROOM + +from . import ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService REQUIREMENTS = ['hipnotify==1.0.8'] diff --git a/homeassistant/components/notify/html5.py b/homeassistant/components/notify/html5.py index 17f7e3163..f9bf36e61 100644 --- a/homeassistant/components/notify/html5.py +++ b/homeassistant/components/notify/html5.py @@ -5,9 +5,9 @@ For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.html5/ """ import datetime +from functools import partial import json import logging -from functools import partial import time import uuid @@ -15,18 +15,19 @@ from aiohttp.hdrs import AUTHORIZATION import voluptuous as vol from voluptuous.humanize import humanize_error -from homeassistant.util.json import load_json, save_json -from homeassistant.exceptions import HomeAssistantError from homeassistant.components import websocket_api from homeassistant.components.frontend import add_manifest_json_key from homeassistant.components.http import HomeAssistantView -from homeassistant.components.notify import ( - ATTR_DATA, ATTR_TITLE, ATTR_TARGET, PLATFORM_SCHEMA, ATTR_TITLE_DEFAULT, - BaseNotificationService, DOMAIN) from homeassistant.const import ( - URL_ROOT, HTTP_BAD_REQUEST, HTTP_UNAUTHORIZED, HTTP_INTERNAL_SERVER_ERROR) + HTTP_BAD_REQUEST, HTTP_INTERNAL_SERVER_ERROR, HTTP_UNAUTHORIZED, URL_ROOT) +from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import config_validation as cv from homeassistant.util import ensure_unique_string +from homeassistant.util.json import load_json, save_json + +from . import ( + ATTR_DATA, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, DOMAIN, + PLATFORM_SCHEMA, BaseNotificationService) REQUIREMENTS = ['pywebpush==1.6.0'] diff --git a/homeassistant/components/notify/kodi.py b/homeassistant/components/notify/kodi.py index 50d2246cd..2dd33bf89 100644 --- a/homeassistant/components/notify/kodi.py +++ b/homeassistant/components/notify/kodi.py @@ -10,14 +10,15 @@ import aiohttp import voluptuous as vol from homeassistant.const import ( - ATTR_ICON, CONF_HOST, CONF_PORT, CONF_USERNAME, CONF_PASSWORD, - CONF_PROXY_SSL) -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, PLATFORM_SCHEMA, - BaseNotificationService) + ATTR_ICON, CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_PROXY_SSL, + CONF_USERNAME) from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + REQUIREMENTS = ['jsonrpc-async==0.6'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/lannouncer.py b/homeassistant/components/notify/lannouncer.py index 5677f38b0..5c975e842 100644 --- a/homeassistant/components/notify/lannouncer.py +++ b/homeassistant/components/notify/lannouncer.py @@ -5,16 +5,16 @@ For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.lannouncer/ """ import logging - -from urllib.parse import urlencode import socket +from urllib.parse import urlencode + import voluptuous as vol -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, ATTR_DATA, BaseNotificationService) -from homeassistant.const import (CONF_HOST, CONF_PORT) +from homeassistant.const import CONF_HOST, CONF_PORT import homeassistant.helpers.config_validation as cv +from . import ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService + ATTR_METHOD = 'method' ATTR_METHOD_DEFAULT = 'speak' ATTR_METHOD_ALLOWED = ['speak', 'alarm'] diff --git a/homeassistant/components/notify/llamalab_automate.py b/homeassistant/components/notify/llamalab_automate.py index 0ddcb450b..d3689dbbd 100644 --- a/homeassistant/components/notify/llamalab_automate.py +++ b/homeassistant/components/notify/llamalab_automate.py @@ -5,14 +5,14 @@ For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.llamalab_automate/ """ import logging + import requests import voluptuous as vol -from homeassistant.components.notify import ( - BaseNotificationService, PLATFORM_SCHEMA) from homeassistant.const import CONF_API_KEY, CONF_DEVICE from homeassistant.helpers import config_validation as cv +from . import PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) _RESOURCE = 'https://llamalab.com/automate/cloud/message' diff --git a/homeassistant/components/notify/mastodon.py b/homeassistant/components/notify/mastodon.py index 095e3f98f..59c787bc0 100644 --- a/homeassistant/components/notify/mastodon.py +++ b/homeassistant/components/notify/mastodon.py @@ -8,11 +8,11 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_ACCESS_TOKEN import homeassistant.helpers.config_validation as cv +from . import PLATFORM_SCHEMA, BaseNotificationService + REQUIREMENTS = ['Mastodon.py==1.3.1'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/message_bird.py b/homeassistant/components/notify/message_bird.py index fa747ccba..c45d153d8 100644 --- a/homeassistant/components/notify/message_bird.py +++ b/homeassistant/components/notify/message_bird.py @@ -8,10 +8,10 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_API_KEY, CONF_SENDER +import homeassistant.helpers.config_validation as cv + +from . import ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService REQUIREMENTS = ['messagebird==1.2.0'] diff --git a/homeassistant/components/notify/mycroft.py b/homeassistant/components/notify/mycroft.py index 1fd22c5c4..e9cd44d5d 100644 --- a/homeassistant/components/notify/mycroft.py +++ b/homeassistant/components/notify/mycroft.py @@ -6,8 +6,7 @@ https://home-assistant.io/components/notify.mycroft/ """ import logging - -from homeassistant.components.notify import BaseNotificationService +from . import BaseNotificationService DEPENDENCIES = ['mycroft'] diff --git a/homeassistant/components/notify/nfandroidtv.py b/homeassistant/components/notify/nfandroidtv.py index f99d97574..8127b4b3e 100644 --- a/homeassistant/components/notify/nfandroidtv.py +++ b/homeassistant/components/notify/nfandroidtv.py @@ -4,21 +4,21 @@ Notifications for Android TV notification service. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.nfandroidtv/ """ -import logging -import io import base64 +import io +import logging import requests -from requests.auth import HTTPBasicAuth -from requests.auth import HTTPDigestAuth +from requests.auth import HTTPBasicAuth, HTTPDigestAuth import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, BaseNotificationService, - PLATFORM_SCHEMA) from homeassistant.const import CONF_TIMEOUT import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + _LOGGER = logging.getLogger(__name__) CONF_IP = 'host' diff --git a/homeassistant/components/notify/prowl.py b/homeassistant/components/notify/prowl.py index f0741766a..27ce8d0fb 100644 --- a/homeassistant/components/notify/prowl.py +++ b/homeassistant/components/notify/prowl.py @@ -4,18 +4,19 @@ Prowl notification service. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.prowl/ """ -import logging import asyncio +import logging import async_timeout import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, PLATFORM_SCHEMA, - BaseNotificationService) from homeassistant.const import CONF_API_KEY -import homeassistant.helpers.config_validation as cv from homeassistant.helpers.aiohttp_client import async_get_clientsession +import homeassistant.helpers.config_validation as cv + +from . import ( + ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) _LOGGER = logging.getLogger(__name__) _RESOURCE = 'https://api.prowlapp.com/publicapi/' diff --git a/homeassistant/components/notify/pushbullet.py b/homeassistant/components/notify/pushbullet.py index a94cf4f10..505d6f4e1 100644 --- a/homeassistant/components/notify/pushbullet.py +++ b/homeassistant/components/notify/pushbullet.py @@ -9,12 +9,13 @@ import mimetypes import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_DATA, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, - BaseNotificationService) from homeassistant.const import CONF_API_KEY import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_DATA, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + REQUIREMENTS = ['pushbullet.py==0.11.0'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/pushetta.py b/homeassistant/components/notify/pushetta.py index a29cd5871..5db671775 100644 --- a/homeassistant/components/notify/pushetta.py +++ b/homeassistant/components/notify/pushetta.py @@ -8,11 +8,12 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_API_KEY import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) + _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ['pushetta==1.0.15'] diff --git a/homeassistant/components/notify/pushover.py b/homeassistant/components/notify/pushover.py index b249ca804..372ea361f 100644 --- a/homeassistant/components/notify/pushover.py +++ b/homeassistant/components/notify/pushover.py @@ -8,12 +8,13 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_TARGET, ATTR_DATA, - BaseNotificationService, PLATFORM_SCHEMA) from homeassistant.const import CONF_API_KEY import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_DATA, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + REQUIREMENTS = ['python-pushover==0.3'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/pushsafer.py b/homeassistant/components/notify/pushsafer.py index 94dc08a81..9a3308ff2 100644 --- a/homeassistant/components/notify/pushsafer.py +++ b/homeassistant/components/notify/pushsafer.py @@ -4,19 +4,20 @@ Pushsafer platform for notify component. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.pushsafer/ """ -import logging import base64 +import logging import mimetypes import requests from requests.auth import HTTPBasicAuth import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_TARGET, ATTR_DATA, - PLATFORM_SCHEMA, BaseNotificationService) import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_DATA, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + _LOGGER = logging.getLogger(__name__) _RESOURCE = 'https://www.pushsafer.com/api' _ALLOWED_IMAGES = ['image/gif', 'image/jpeg', 'image/png'] diff --git a/homeassistant/components/notify/rest.py b/homeassistant/components/notify/rest.py index 469319a0f..eec2ea4aa 100644 --- a/homeassistant/components/notify/rest.py +++ b/homeassistant/components/notify/rest.py @@ -9,16 +9,16 @@ import logging import requests import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, BaseNotificationService, - PLATFORM_SCHEMA) -from homeassistant.const import (CONF_AUTHENTICATION, CONF_HEADERS, - CONF_METHOD, CONF_NAME, CONF_PASSWORD, - CONF_RESOURCE, CONF_USERNAME, CONF_VERIFY_SSL, - HTTP_BASIC_AUTHENTICATION, - HTTP_DIGEST_AUTHENTICATION) +from homeassistant.const import ( + CONF_AUTHENTICATION, CONF_HEADERS, CONF_METHOD, CONF_NAME, CONF_PASSWORD, + CONF_RESOURCE, CONF_USERNAME, CONF_VERIFY_SSL, HTTP_BASIC_AUTHENTICATION, + HTTP_DIGEST_AUTHENTICATION) import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, + BaseNotificationService) + CONF_DATA = 'data' CONF_DATA_TEMPLATE = 'data_template' CONF_MESSAGE_PARAMETER_NAME = 'message_param_name' diff --git a/homeassistant/components/notify/rocketchat.py b/homeassistant/components/notify/rocketchat.py index e9b481b1c..116c32993 100644 --- a/homeassistant/components/notify/rocketchat.py +++ b/homeassistant/components/notify/rocketchat.py @@ -8,11 +8,11 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.const import ( - CONF_URL, CONF_USERNAME, CONF_PASSWORD, CONF_ROOM) -from homeassistant.components.notify import ( - ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) + CONF_PASSWORD, CONF_ROOM, CONF_URL, CONF_USERNAME) +import homeassistant.helpers.config_validation as cv + +from . import ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService REQUIREMENTS = ['rocketchat-API==0.6.1'] diff --git a/homeassistant/components/notify/sendgrid.py b/homeassistant/components/notify/sendgrid.py index e72dcbbed..6bab566bf 100644 --- a/homeassistant/components/notify/sendgrid.py +++ b/homeassistant/components/notify/sendgrid.py @@ -8,12 +8,13 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import ( - CONF_API_KEY, CONF_SENDER, CONF_RECIPIENT, CONTENT_TYPE_TEXT_PLAIN) + CONF_API_KEY, CONF_RECIPIENT, CONF_SENDER, CONTENT_TYPE_TEXT_PLAIN) import homeassistant.helpers.config_validation as cv +from . import ( + ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) + REQUIREMENTS = ['sendgrid==5.6.0'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/simplepush.py b/homeassistant/components/notify/simplepush.py index 9d5c58fc5..1d198b5ad 100644 --- a/homeassistant/components/notify/simplepush.py +++ b/homeassistant/components/notify/simplepush.py @@ -8,10 +8,11 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_PASSWORD +import homeassistant.helpers.config_validation as cv + +from . import ( + ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) REQUIREMENTS = ['simplepush==1.1.4'] diff --git a/homeassistant/components/notify/slack.py b/homeassistant/components/notify/slack.py index 961f67120..7aee58ed0 100644 --- a/homeassistant/components/notify/slack.py +++ b/homeassistant/components/notify/slack.py @@ -7,15 +7,15 @@ https://home-assistant.io/components/notify.slack/ import logging import requests -from requests.auth import HTTPBasicAuth -from requests.auth import HTTPDigestAuth +from requests.auth import HTTPBasicAuth, HTTPDigestAuth import voluptuous as vol +from homeassistant.const import CONF_API_KEY, CONF_ICON, CONF_USERNAME import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TARGET, ATTR_TITLE, ATTR_DATA, PLATFORM_SCHEMA, + +from . import ( + ATTR_DATA, ATTR_TARGET, ATTR_TITLE, PLATFORM_SCHEMA, BaseNotificationService) -from homeassistant.const import (CONF_API_KEY, CONF_USERNAME, CONF_ICON) REQUIREMENTS = ['slacker==0.12.0'] diff --git a/homeassistant/components/notify/smtp.py b/homeassistant/components/notify/smtp.py index e3a6f8b85..995aae76c 100644 --- a/homeassistant/components/notify/smtp.py +++ b/homeassistant/components/notify/smtp.py @@ -4,25 +4,26 @@ Mail (SMTP) notification service. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.smtp/ """ -import logging -import smtplib +from email.mime.application import MIMEApplication +from email.mime.image import MIMEImage from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from email.mime.image import MIMEImage -from email.mime.application import MIMEApplication import email.utils +import logging import os +import smtplib import voluptuous as vol +from homeassistant.const import ( + CONF_PASSWORD, CONF_PORT, CONF_RECIPIENT, CONF_SENDER, CONF_TIMEOUT, + CONF_USERNAME) import homeassistant.helpers.config_validation as cv import homeassistant.util.dt as dt_util -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, PLATFORM_SCHEMA, + +from . import ( + ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) -from homeassistant.const import ( - CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_TIMEOUT, - CONF_SENDER, CONF_RECIPIENT) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/stride.py b/homeassistant/components/notify/stride.py index f31e50a58..f5f5b52ab 100644 --- a/homeassistant/components/notify/stride.py +++ b/homeassistant/components/notify/stride.py @@ -8,10 +8,10 @@ import logging import voluptuous as vol +from homeassistant.const import CONF_ROOM, CONF_TOKEN import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TARGET, ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) -from homeassistant.const import CONF_TOKEN, CONF_ROOM + +from . import ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService REQUIREMENTS = ['pystride==0.1.7'] diff --git a/homeassistant/components/notify/synology_chat.py b/homeassistant/components/notify/synology_chat.py index 922631b40..023586ae5 100644 --- a/homeassistant/components/notify/synology_chat.py +++ b/homeassistant/components/notify/synology_chat.py @@ -4,17 +4,17 @@ SynologyChat platform for notify component. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.synology_chat/ """ -import logging import json +import logging import requests import voluptuous as vol -from homeassistant.components.notify import ( - BaseNotificationService, PLATFORM_SCHEMA, ATTR_DATA) from homeassistant.const import CONF_RESOURCE, CONF_VERIFY_SSL import homeassistant.helpers.config_validation as cv +from . import ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService + ATTR_FILE_URL = 'file_url' PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ diff --git a/homeassistant/components/notify/syslog.py b/homeassistant/components/notify/syslog.py index 740148e28..4f7900b8d 100644 --- a/homeassistant/components/notify/syslog.py +++ b/homeassistant/components/notify/syslog.py @@ -8,7 +8,7 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( +from . import ( ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/telegram.py b/homeassistant/components/notify/telegram.py index 1dff82fa2..a6975f60f 100644 --- a/homeassistant/components/notify/telegram.py +++ b/homeassistant/components/notify/telegram.py @@ -8,11 +8,12 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_MESSAGE, ATTR_TITLE, ATTR_DATA, ATTR_TARGET, - PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import ATTR_LOCATION +from . import ( + ATTR_DATA, ATTR_MESSAGE, ATTR_TARGET, ATTR_TITLE, PLATFORM_SCHEMA, + BaseNotificationService) + _LOGGER = logging.getLogger(__name__) DOMAIN = 'telegram_bot' diff --git a/homeassistant/components/notify/twilio_call.py b/homeassistant/components/notify/twilio_call.py index 538a4fd95..4826ab776 100644 --- a/homeassistant/components/notify/twilio_call.py +++ b/homeassistant/components/notify/twilio_call.py @@ -11,8 +11,8 @@ import voluptuous as vol from homeassistant.components.twilio import DATA_TWILIO import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) + +from . import ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/twilio_sms.py b/homeassistant/components/notify/twilio_sms.py index e106c5ae6..165e74397 100644 --- a/homeassistant/components/notify/twilio_sms.py +++ b/homeassistant/components/notify/twilio_sms.py @@ -10,8 +10,8 @@ import voluptuous as vol from homeassistant.components.twilio import DATA_TWILIO import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService) + +from . import ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ["twilio"] diff --git a/homeassistant/components/notify/twitter.py b/homeassistant/components/notify/twitter.py index d49495271..43d977d26 100644 --- a/homeassistant/components/notify/twitter.py +++ b/homeassistant/components/notify/twitter.py @@ -4,21 +4,21 @@ Twitter platform for notify component. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/notify.twitter/ """ +from datetime import datetime, timedelta +from functools import partial import json import logging import mimetypes import os -from datetime import timedelta, datetime -from functools import partial import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import ( - ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.event import async_track_point_in_time +from . import ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService + REQUIREMENTS = ['TwitterAPI==2.5.9'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/xmpp.py b/homeassistant/components/notify/xmpp.py index 462dd007d..382767431 100644 --- a/homeassistant/components/notify/xmpp.py +++ b/homeassistant/components/notify/xmpp.py @@ -14,13 +14,14 @@ import string import requests import voluptuous as vol -from homeassistant.components.notify import ( - ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) from homeassistant.const import ( CONF_PASSWORD, CONF_RECIPIENT, CONF_RESOURCE, CONF_ROOM, CONF_SENDER) import homeassistant.helpers.config_validation as cv import homeassistant.helpers.template as template_helper +from . import ( + ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA, BaseNotificationService) + REQUIREMENTS = ['slixmpp==1.4.2'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notify/yessssms.py b/homeassistant/components/notify/yessssms.py index e16e384ca..19efa2a53 100644 --- a/homeassistant/components/notify/yessssms.py +++ b/homeassistant/components/notify/yessssms.py @@ -8,11 +8,10 @@ import logging import voluptuous as vol -from homeassistant.components.notify import ( - PLATFORM_SCHEMA, BaseNotificationService) -from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_RECIPIENT +from homeassistant.const import CONF_PASSWORD, CONF_RECIPIENT, CONF_USERNAME import homeassistant.helpers.config_validation as cv +from . import PLATFORM_SCHEMA, BaseNotificationService REQUIREMENTS = ['YesssSMS==0.2.3'] diff --git a/homeassistant/components/nuheat/climate.py b/homeassistant/components/nuheat/climate.py index f52d2c7b5..27e909f8f 100644 --- a/homeassistant/components/nuheat/climate.py +++ b/homeassistant/components/nuheat/climate.py @@ -4,29 +4,22 @@ Support for NuHeat thermostats. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/climate.nuheat/ """ -import logging from datetime import timedelta +import logging import voluptuous as vol from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - DOMAIN, - SUPPORT_HOLD_MODE, - SUPPORT_OPERATION_MODE, - SUPPORT_TARGET_TEMPERATURE, - STATE_AUTO, - STATE_HEAT, - STATE_IDLE) -from homeassistant.components.nuheat import DOMAIN as NUHEAT_DOMAIN + DOMAIN, STATE_AUTO, STATE_HEAT, STATE_IDLE, SUPPORT_HOLD_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( - ATTR_ENTITY_ID, - ATTR_TEMPERATURE, - TEMP_CELSIUS, - TEMP_FAHRENHEIT) + ATTR_ENTITY_ID, ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT) import homeassistant.helpers.config_validation as cv from homeassistant.util import Throttle +from . import DOMAIN as NUHEAT_DOMAIN + DEPENDENCIES = ["nuheat"] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/octoprint/binary_sensor.py b/homeassistant/components/octoprint/binary_sensor.py index cb8601777..be3381f3b 100644 --- a/homeassistant/components/octoprint/binary_sensor.py +++ b/homeassistant/components/octoprint/binary_sensor.py @@ -3,10 +3,10 @@ import logging import requests -from homeassistant.components.octoprint import (BINARY_SENSOR_TYPES, - DOMAIN as COMPONENT_DOMAIN) from homeassistant.components.binary_sensor import BinarySensorDevice +from . import BINARY_SENSOR_TYPES, DOMAIN as COMPONENT_DOMAIN + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['octoprint'] diff --git a/homeassistant/components/octoprint/sensor.py b/homeassistant/components/octoprint/sensor.py index 2df307f02..f07d88d11 100644 --- a/homeassistant/components/octoprint/sensor.py +++ b/homeassistant/components/octoprint/sensor.py @@ -3,11 +3,11 @@ import logging import requests -from homeassistant.components.octoprint import (SENSOR_TYPES, - DOMAIN as COMPONENT_DOMAIN) -from homeassistant.const import (TEMP_CELSIUS) +from homeassistant.const import TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import DOMAIN as COMPONENT_DOMAIN, SENSOR_TYPES + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['octoprint'] diff --git a/homeassistant/components/opentherm_gw/binary_sensor.py b/homeassistant/components/opentherm_gw/binary_sensor.py index b35998c80..d0b60a257 100644 --- a/homeassistant/components/opentherm_gw/binary_sensor.py +++ b/homeassistant/components/opentherm_gw/binary_sensor.py @@ -2,12 +2,12 @@ import logging from homeassistant.components.binary_sensor import ( - BinarySensorDevice, ENTITY_ID_FORMAT) -from homeassistant.components.opentherm_gw import ( - DATA_GW_VARS, DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE) + ENTITY_ID_FORMAT, BinarySensorDevice) from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import async_generate_entity_id +from . import DATA_GW_VARS, DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE + _LOGGER = logging.getLogger(__name__) DEVICE_CLASS_COLD = 'cold' diff --git a/homeassistant/components/opentherm_gw/climate.py b/homeassistant/components/opentherm_gw/climate.py index 1a7c03163..58ce49a9b 100644 --- a/homeassistant/components/opentherm_gw/climate.py +++ b/homeassistant/components/opentherm_gw/climate.py @@ -3,14 +3,15 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_IDLE, STATE_HEAT, STATE_COOL, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.opentherm_gw import ( + STATE_COOL, STATE_HEAT, STATE_IDLE, SUPPORT_TARGET_TEMPERATURE) +from homeassistant.const import ( + ATTR_TEMPERATURE, CONF_NAME, PRECISION_HALVES, PRECISION_TENTHS, + PRECISION_WHOLE, TEMP_CELSIUS) +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ( CONF_FLOOR_TEMP, CONF_PRECISION, DATA_DEVICE, DATA_GW_VARS, DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE) -from homeassistant.const import (ATTR_TEMPERATURE, CONF_NAME, PRECISION_HALVES, - PRECISION_TENTHS, PRECISION_WHOLE, - TEMP_CELSIUS) -from homeassistant.helpers.dispatcher import async_dispatcher_connect _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/opentherm_gw/sensor.py b/homeassistant/components/opentherm_gw/sensor.py index 070f847e5..5c64b8ab7 100644 --- a/homeassistant/components/opentherm_gw/sensor.py +++ b/homeassistant/components/opentherm_gw/sensor.py @@ -1,13 +1,13 @@ """Support for OpenTherm Gateway sensors.""" import logging -from homeassistant.components.opentherm_gw import ( - DATA_GW_VARS, DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE) from homeassistant.components.sensor import ENTITY_ID_FORMAT from homeassistant.const import DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity, async_generate_entity_id +from . import DATA_GW_VARS, DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE + _LOGGER = logging.getLogger(__name__) UNIT_BAR = 'bar' diff --git a/homeassistant/components/openuv/binary_sensor.py b/homeassistant/components/openuv/binary_sensor.py index b790427b2..cfc82a757 100644 --- a/homeassistant/components/openuv/binary_sensor.py +++ b/homeassistant/components/openuv/binary_sensor.py @@ -2,13 +2,14 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.openuv import ( - BINARY_SENSORS, DATA_OPENUV_CLIENT, DATA_PROTECTION_WINDOW, DOMAIN, - TOPIC_UPDATE, TYPE_PROTECTION_WINDOW, OpenUvEntity) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.util.dt import as_local, parse_datetime, utcnow +from . import ( + BINARY_SENSORS, DATA_OPENUV_CLIENT, DATA_PROTECTION_WINDOW, DOMAIN, + TOPIC_UPDATE, TYPE_PROTECTION_WINDOW, OpenUvEntity) + _LOGGER = logging.getLogger(__name__) ATTR_PROTECTION_WINDOW_ENDING_TIME = 'end_time' ATTR_PROTECTION_WINDOW_ENDING_UV = 'end_uv' diff --git a/homeassistant/components/openuv/sensor.py b/homeassistant/components/openuv/sensor.py index 489a100a5..42780d57b 100644 --- a/homeassistant/components/openuv/sensor.py +++ b/homeassistant/components/openuv/sensor.py @@ -1,15 +1,16 @@ """Support for OpenUV sensors.""" import logging -from homeassistant.components.openuv import ( +from homeassistant.core import callback +from homeassistant.helpers.dispatcher import async_dispatcher_connect +from homeassistant.util.dt import as_local, parse_datetime + +from . import ( DATA_OPENUV_CLIENT, DATA_UV, DOMAIN, SENSORS, TOPIC_UPDATE, TYPE_CURRENT_OZONE_LEVEL, TYPE_CURRENT_UV_INDEX, TYPE_CURRENT_UV_LEVEL, TYPE_MAX_UV_INDEX, TYPE_SAFE_EXPOSURE_TIME_1, TYPE_SAFE_EXPOSURE_TIME_2, TYPE_SAFE_EXPOSURE_TIME_3, TYPE_SAFE_EXPOSURE_TIME_4, TYPE_SAFE_EXPOSURE_TIME_5, TYPE_SAFE_EXPOSURE_TIME_6, OpenUvEntity) -from homeassistant.core import callback -from homeassistant.helpers.dispatcher import async_dispatcher_connect -from homeassistant.util.dt import as_local, parse_datetime _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/owlet/binary_sensor.py b/homeassistant/components/owlet/binary_sensor.py index cb6627815..bcdd0fec1 100644 --- a/homeassistant/components/owlet/binary_sensor.py +++ b/homeassistant/components/owlet/binary_sensor.py @@ -2,9 +2,9 @@ from datetime import timedelta from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.owlet import DOMAIN as OWLET_DOMAIN from homeassistant.util import dt as dt_util +from . import DOMAIN as OWLET_DOMAIN from .const import SENSOR_BASE_STATION, SENSOR_MOVEMENT SCAN_INTERVAL = timedelta(seconds=120) diff --git a/homeassistant/components/owlet/sensor.py b/homeassistant/components/owlet/sensor.py index b91cc3877..849e0858a 100644 --- a/homeassistant/components/owlet/sensor.py +++ b/homeassistant/components/owlet/sensor.py @@ -1,10 +1,10 @@ """Support for Owlet sensors.""" from datetime import timedelta -from homeassistant.components.owlet import DOMAIN as OWLET_DOMAIN from homeassistant.helpers.entity import Entity from homeassistant.util import dt as dt_util +from . import DOMAIN as OWLET_DOMAIN from .const import SENSOR_HEART_RATE, SENSOR_OXYGEN_LEVEL SCAN_INTERVAL = timedelta(seconds=120) diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py index be8698a47..f1214b62b 100644 --- a/homeassistant/components/owntracks/device_tracker.py +++ b/homeassistant/components/owntracks/device_tracker.py @@ -9,12 +9,11 @@ import logging from homeassistant.components import zone as zone_comp from homeassistant.components.device_tracker import ( - ATTR_SOURCE_TYPE, SOURCE_TYPE_BLUETOOTH_LE, SOURCE_TYPE_GPS -) -from homeassistant.components.owntracks import DOMAIN as OT_DOMAIN + ATTR_SOURCE_TYPE, SOURCE_TYPE_BLUETOOTH_LE, SOURCE_TYPE_GPS) from homeassistant.const import STATE_HOME -from homeassistant.util import slugify, decorator +from homeassistant.util import decorator, slugify +from . import DOMAIN as OT_DOMAIN DEPENDENCIES = ['owntracks'] diff --git a/homeassistant/components/plum_lightpad/light.py b/homeassistant/components/plum_lightpad/light.py index 43cceaa67..233539560 100644 --- a/homeassistant/components/plum_lightpad/light.py +++ b/homeassistant/components/plum_lightpad/light.py @@ -1,9 +1,10 @@ """Support for Plum Lightpad lights.""" from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light) -from homeassistant.components.plum_lightpad import PLUM_DATA import homeassistant.util.color as color_util +from . import PLUM_DATA + DEPENDENCIES = ['plum_lightpad'] diff --git a/homeassistant/components/point/alarm_control_panel.py b/homeassistant/components/point/alarm_control_panel.py index a50dffe42..4fd5ffea6 100644 --- a/homeassistant/components/point/alarm_control_panel.py +++ b/homeassistant/components/point/alarm_control_panel.py @@ -3,13 +3,13 @@ import logging from homeassistant.components.alarm_control_panel import ( DOMAIN, AlarmControlPanel) -from homeassistant.components.point.const import ( - DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK) from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from .const import DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/point/binary_sensor.py b/homeassistant/components/point/binary_sensor.py index c29ce4216..2276d4e2f 100644 --- a/homeassistant/components/point/binary_sensor.py +++ b/homeassistant/components/point/binary_sensor.py @@ -2,12 +2,12 @@ import logging from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice -from homeassistant.components.point import MinutPointEntity -from homeassistant.components.point.const import ( - DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import MinutPointEntity +from .const import DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK + _LOGGER = logging.getLogger(__name__) EVENTS = { diff --git a/homeassistant/components/point/sensor.py b/homeassistant/components/point/sensor.py index 90b83ba42..46399c82a 100644 --- a/homeassistant/components/point/sensor.py +++ b/homeassistant/components/point/sensor.py @@ -1,9 +1,6 @@ """Support for Minut Point sensors.""" import logging -from homeassistant.components.point import MinutPointEntity -from homeassistant.components.point.const import ( - DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW) from homeassistant.components.sensor import DOMAIN from homeassistant.const import ( DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE, DEVICE_CLASS_TEMPERATURE, @@ -11,6 +8,9 @@ from homeassistant.const import ( from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.util.dt import parse_datetime +from . import MinutPointEntity +from .const import DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW + _LOGGER = logging.getLogger(__name__) DEVICE_CLASS_SOUND = 'sound_level' diff --git a/homeassistant/components/ps4/__init__.py b/homeassistant/components/ps4/__init__.py index 087d3f89f..edefb5e47 100644 --- a/homeassistant/components/ps4/__init__.py +++ b/homeassistant/components/ps4/__init__.py @@ -6,8 +6,9 @@ https://home-assistant.io/components/ps4/ """ import logging -from homeassistant.components.ps4.config_flow import PlayStation4FlowHandler # noqa: pylint: disable=unused-import -from homeassistant.components.ps4.const import DOMAIN # noqa: pylint: disable=unused-import +from .config_flow import ( # noqa pylint: disable=unused-import + PlayStation4FlowHandler) +from .const import DOMAIN # noqa: pylint: disable=unused-import _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ps4/config_flow.py b/homeassistant/components/ps4/config_flow.py index d000ed1f7..482c7383d 100644 --- a/homeassistant/components/ps4/config_flow.py +++ b/homeassistant/components/ps4/config_flow.py @@ -5,11 +5,11 @@ import logging import voluptuous as vol from homeassistant import config_entries -from homeassistant.components.ps4.const import ( - DEFAULT_NAME, DEFAULT_REGION, DOMAIN, REGIONS) from homeassistant.const import ( CONF_CODE, CONF_HOST, CONF_IP_ADDRESS, CONF_NAME, CONF_REGION, CONF_TOKEN) +from .const import DEFAULT_NAME, DEFAULT_REGION, DOMAIN, REGIONS + _LOGGER = logging.getLogger(__name__) UDP_PORT = 987 diff --git a/homeassistant/components/ps4/media_player.py b/homeassistant/components/ps4/media_player.py index e2b8e97f4..60b656a46 100644 --- a/homeassistant/components/ps4/media_player.py +++ b/homeassistant/components/ps4/media_player.py @@ -9,20 +9,18 @@ import socket import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.media_player import ( - MediaPlayerDevice, ENTITY_IMAGE_URL) + ENTITY_IMAGE_URL, MediaPlayerDevice) from homeassistant.components.media_player.const import ( - MEDIA_TYPE_MUSIC, SUPPORT_SELECT_SOURCE, - SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, -) -from homeassistant.components.ps4.const import DOMAIN as PS4_DOMAIN + MEDIA_TYPE_MUSIC, SUPPORT_SELECT_SOURCE, SUPPORT_STOP, SUPPORT_TURN_OFF, + SUPPORT_TURN_ON) from homeassistant.const import ( - ATTR_ENTITY_ID, ATTR_COMMAND, CONF_HOST, CONF_NAME, CONF_REGION, - CONF_TOKEN, STATE_IDLE, STATE_OFF, STATE_PLAYING, -) + ATTR_COMMAND, ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, CONF_REGION, + CONF_TOKEN, STATE_IDLE, STATE_OFF, STATE_PLAYING) +import homeassistant.helpers.config_validation as cv from homeassistant.util.json import load_json, save_json +from .const import DOMAIN as PS4_DOMAIN DEPENDENCIES = ['ps4'] diff --git a/homeassistant/components/qwikswitch/binary_sensor.py b/homeassistant/components/qwikswitch/binary_sensor.py index 2fe14773d..17021f7a9 100644 --- a/homeassistant/components/qwikswitch/binary_sensor.py +++ b/homeassistant/components/qwikswitch/binary_sensor.py @@ -7,9 +7,10 @@ https://home-assistant.io/components/binary_sensor.qwikswitch/ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.qwikswitch import QSEntity, DOMAIN as QWIKSWITCH from homeassistant.core import callback +from . import DOMAIN as QWIKSWITCH, QSEntity + DEPENDENCIES = [QWIKSWITCH] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/qwikswitch/light.py b/homeassistant/components/qwikswitch/light.py index 413358d9c..46a0a8848 100644 --- a/homeassistant/components/qwikswitch/light.py +++ b/homeassistant/components/qwikswitch/light.py @@ -4,10 +4,10 @@ Support for Qwikswitch Relays and Dimmers. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/light.qwikswitch/ """ -from homeassistant.components.qwikswitch import ( - QSToggleEntity, DOMAIN as QWIKSWITCH) from homeassistant.components.light import SUPPORT_BRIGHTNESS, Light +from . import DOMAIN as QWIKSWITCH, QSToggleEntity + DEPENDENCIES = [QWIKSWITCH] diff --git a/homeassistant/components/qwikswitch/sensor.py b/homeassistant/components/qwikswitch/sensor.py index c8d33de4b..07d0247e4 100644 --- a/homeassistant/components/qwikswitch/sensor.py +++ b/homeassistant/components/qwikswitch/sensor.py @@ -6,9 +6,10 @@ https://home-assistant.io/components/sensor.qwikswitch/ """ import logging -from homeassistant.components.qwikswitch import DOMAIN as QWIKSWITCH, QSEntity from homeassistant.core import callback +from . import DOMAIN as QWIKSWITCH, QSEntity + DEPENDENCIES = [QWIKSWITCH] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/qwikswitch/switch.py b/homeassistant/components/qwikswitch/switch.py index 3b8e6d74d..ec544df8c 100644 --- a/homeassistant/components/qwikswitch/switch.py +++ b/homeassistant/components/qwikswitch/switch.py @@ -4,10 +4,10 @@ Support for Qwikswitch relays. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/switch.qwikswitch/ """ -from homeassistant.components.qwikswitch import ( - QSToggleEntity, DOMAIN as QWIKSWITCH) from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as QWIKSWITCH, QSToggleEntity + DEPENDENCIES = [QWIKSWITCH] diff --git a/homeassistant/components/rachio/binary_sensor.py b/homeassistant/components/rachio/binary_sensor.py index 36a32c79c..9cf57ea32 100644 --- a/homeassistant/components/rachio/binary_sensor.py +++ b/homeassistant/components/rachio/binary_sensor.py @@ -8,17 +8,13 @@ from abc import abstractmethod import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.rachio import (DOMAIN as DOMAIN_RACHIO, - KEY_DEVICE_ID, - KEY_STATUS, - KEY_SUBTYPE, - SIGNAL_RACHIO_CONTROLLER_UPDATE, - STATUS_OFFLINE, - STATUS_ONLINE, - SUBTYPE_OFFLINE, - SUBTYPE_ONLINE,) from homeassistant.helpers.dispatcher import dispatcher_connect +from . import ( + DOMAIN as DOMAIN_RACHIO, KEY_DEVICE_ID, KEY_STATUS, KEY_SUBTYPE, + SIGNAL_RACHIO_CONTROLLER_UPDATE, STATUS_OFFLINE, STATUS_ONLINE, + SUBTYPE_OFFLINE, SUBTYPE_ONLINE) + DEPENDENCIES = ['rachio'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rachio/switch.py b/homeassistant/components/rachio/switch.py index 4797aae9a..fe584441a 100644 --- a/homeassistant/components/rachio/switch.py +++ b/homeassistant/components/rachio/switch.py @@ -9,26 +9,15 @@ from datetime import timedelta import logging from homeassistant.components.switch import SwitchDevice -from homeassistant.components.rachio import (CONF_MANUAL_RUN_MINS, - DOMAIN as DOMAIN_RACHIO, - KEY_DEVICE_ID, - KEY_ENABLED, - KEY_ID, - KEY_NAME, - KEY_ON, - KEY_SUBTYPE, - KEY_SUMMARY, - KEY_ZONE_ID, - KEY_ZONE_NUMBER, - SIGNAL_RACHIO_CONTROLLER_UPDATE, - SIGNAL_RACHIO_ZONE_UPDATE, - SUBTYPE_ZONE_STARTED, - SUBTYPE_ZONE_STOPPED, - SUBTYPE_ZONE_COMPLETED, - SUBTYPE_SLEEP_MODE_ON, - SUBTYPE_SLEEP_MODE_OFF) from homeassistant.helpers.dispatcher import dispatcher_connect +from . import ( + CONF_MANUAL_RUN_MINS, DOMAIN as DOMAIN_RACHIO, KEY_DEVICE_ID, KEY_ENABLED, + KEY_ID, KEY_NAME, KEY_ON, KEY_SUBTYPE, KEY_SUMMARY, KEY_ZONE_ID, + KEY_ZONE_NUMBER, SIGNAL_RACHIO_CONTROLLER_UPDATE, + SIGNAL_RACHIO_ZONE_UPDATE, SUBTYPE_SLEEP_MODE_OFF, SUBTYPE_SLEEP_MODE_ON, + SUBTYPE_ZONE_COMPLETED, SUBTYPE_ZONE_STARTED, SUBTYPE_ZONE_STOPPED) + DEPENDENCIES = ['rachio'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rainbird/sensor.py b/homeassistant/components/rainbird/sensor.py index 1af2b7710..3d0de04e5 100644 --- a/homeassistant/components/rainbird/sensor.py +++ b/homeassistant/components/rainbird/sensor.py @@ -8,12 +8,13 @@ import logging import voluptuous as vol -from homeassistant.components.rainbird import DATA_RAINBIRD -import homeassistant.helpers.config_validation as cv -from homeassistant.const import CONF_MONITORED_CONDITIONS from homeassistant.components.sensor import PLATFORM_SCHEMA +from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import DATA_RAINBIRD + DEPENDENCIES = ['rainbird'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rainbird/switch.py b/homeassistant/components/rainbird/switch.py index 86f25102f..2031769b3 100644 --- a/homeassistant/components/rainbird/switch.py +++ b/homeassistant/components/rainbird/switch.py @@ -9,13 +9,14 @@ import logging import voluptuous as vol -from homeassistant.components.rainbird import DATA_RAINBIRD -from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA) -from homeassistant.const import (CONF_SWITCHES, CONF_ZONE, - CONF_FRIENDLY_NAME, CONF_TRIGGER_TIME, - CONF_SCAN_INTERVAL) +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +from homeassistant.const import ( + CONF_FRIENDLY_NAME, CONF_SCAN_INTERVAL, CONF_SWITCHES, CONF_TRIGGER_TIME, + CONF_ZONE) from homeassistant.helpers import config_validation as cv +from . import DATA_RAINBIRD + DEPENDENCIES = ['rainbird'] DOMAIN = 'rainbird' diff --git a/homeassistant/components/raincloud/binary_sensor.py b/homeassistant/components/raincloud/binary_sensor.py index 810c7d201..cb66fc3c6 100644 --- a/homeassistant/components/raincloud/binary_sensor.py +++ b/homeassistant/components/raincloud/binary_sensor.py @@ -8,12 +8,12 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.raincloud import ( - BINARY_SENSORS, DATA_RAINCLOUD, ICON_MAP, RainCloudEntity) from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) + PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv + +from . import BINARY_SENSORS, DATA_RAINCLOUD, ICON_MAP, RainCloudEntity DEPENDENCIES = ['raincloud'] diff --git a/homeassistant/components/raincloud/sensor.py b/homeassistant/components/raincloud/sensor.py index 15a346880..8bcccf061 100644 --- a/homeassistant/components/raincloud/sensor.py +++ b/homeassistant/components/raincloud/sensor.py @@ -8,13 +8,13 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.raincloud import ( - DATA_RAINCLOUD, ICON_MAP, RainCloudEntity, SENSORS) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.icon import icon_for_battery_level +from . import DATA_RAINCLOUD, ICON_MAP, SENSORS, RainCloudEntity + DEPENDENCIES = ['raincloud'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/raincloud/switch.py b/homeassistant/components/raincloud/switch.py index 1b76e8974..3901e1e0b 100644 --- a/homeassistant/components/raincloud/switch.py +++ b/homeassistant/components/raincloud/switch.py @@ -3,13 +3,13 @@ import logging import voluptuous as vol +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +from homeassistant.const import ATTR_ATTRIBUTION, CONF_MONITORED_CONDITIONS import homeassistant.helpers.config_validation as cv -from homeassistant.components.raincloud import ( - ALLOWED_WATERING_TIME, ATTRIBUTION, CONF_WATERING_TIME, - DATA_RAINCLOUD, DEFAULT_WATERING_TIME, RainCloudEntity, SWITCHES) -from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA -from homeassistant.const import ( - CONF_MONITORED_CONDITIONS, ATTR_ATTRIBUTION) + +from . import ( + ALLOWED_WATERING_TIME, ATTRIBUTION, CONF_WATERING_TIME, DATA_RAINCLOUD, + DEFAULT_WATERING_TIME, SWITCHES, RainCloudEntity) DEPENDENCIES = ['raincloud'] diff --git a/homeassistant/components/rainmachine/binary_sensor.py b/homeassistant/components/rainmachine/binary_sensor.py index efae93303..929dbcf31 100644 --- a/homeassistant/components/rainmachine/binary_sensor.py +++ b/homeassistant/components/rainmachine/binary_sensor.py @@ -7,13 +7,14 @@ https://home-assistant.io/components/binary_sensor.rainmachine/ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.rainmachine import ( +from homeassistant.core import callback +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ( BINARY_SENSORS, DATA_CLIENT, DOMAIN as RAINMACHINE_DOMAIN, SENSOR_UPDATE_TOPIC, TYPE_FREEZE, TYPE_FREEZE_PROTECTION, TYPE_HOT_DAYS, TYPE_HOURLY, TYPE_MONTH, TYPE_RAINDELAY, TYPE_RAINSENSOR, TYPE_WEEKDAY, RainMachineEntity) -from homeassistant.core import callback -from homeassistant.helpers.dispatcher import async_dispatcher_connect DEPENDENCIES = ['rainmachine'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rainmachine/const.py b/homeassistant/components/rainmachine/const.py index e0e79e8c1..4d08a871f 100644 --- a/homeassistant/components/rainmachine/const.py +++ b/homeassistant/components/rainmachine/const.py @@ -1,8 +1,8 @@ """Define constants for the SimpliSafe component.""" -import logging from datetime import timedelta +import logging -LOGGER = logging.getLogger('homeassistant.components.rainmachine') +LOGGER = logging.getLogger('.') DOMAIN = 'rainmachine' diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py index 86a97bc29..908daa2c8 100644 --- a/homeassistant/components/rainmachine/sensor.py +++ b/homeassistant/components/rainmachine/sensor.py @@ -6,12 +6,13 @@ https://home-assistant.io/components/sensor.rainmachine/ """ import logging -from homeassistant.components.rainmachine import ( - DATA_CLIENT, DOMAIN as RAINMACHINE_DOMAIN, SENSOR_UPDATE_TOPIC, SENSORS, - RainMachineEntity) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from . import ( + DATA_CLIENT, DOMAIN as RAINMACHINE_DOMAIN, SENSOR_UPDATE_TOPIC, SENSORS, + RainMachineEntity) + DEPENDENCIES = ['rainmachine'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rainmachine/switch.py b/homeassistant/components/rainmachine/switch.py index e3a1ddab9..6b658c0fc 100644 --- a/homeassistant/components/rainmachine/switch.py +++ b/homeassistant/components/rainmachine/switch.py @@ -4,18 +4,19 @@ This component provides support for RainMachine programs and zones. For more details about this component, please refer to the documentation at https://home-assistant.io/components/switch.rainmachine/ """ -import logging from datetime import datetime +import logging -from homeassistant.components.rainmachine import ( - DATA_CLIENT, DOMAIN as RAINMACHINE_DOMAIN, PROGRAM_UPDATE_TOPIC, - ZONE_UPDATE_TOPIC, RainMachineEntity) -from homeassistant.const import ATTR_ID from homeassistant.components.switch import SwitchDevice +from homeassistant.const import ATTR_ID from homeassistant.core import callback from homeassistant.helpers.dispatcher import ( async_dispatcher_connect, async_dispatcher_send) +from . import ( + DATA_CLIENT, DOMAIN as RAINMACHINE_DOMAIN, PROGRAM_UPDATE_TOPIC, + ZONE_UPDATE_TOPIC, RainMachineEntity) + DEPENDENCIES = ['rainmachine'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/raspihats/binary_sensor.py b/homeassistant/components/raspihats/binary_sensor.py index b0ebc2e35..29fa474f7 100644 --- a/homeassistant/components/raspihats/binary_sensor.py +++ b/homeassistant/components/raspihats/binary_sensor.py @@ -5,13 +5,14 @@ import voluptuous as vol from homeassistant.components.binary_sensor import ( PLATFORM_SCHEMA, BinarySensorDevice) -from homeassistant.components.raspihats import ( - CONF_BOARD, CONF_CHANNELS, CONF_I2C_HATS, CONF_INDEX, CONF_INVERT_LOGIC, - I2C_HAT_NAMES, I2C_HATS_MANAGER, I2CHatsException) from homeassistant.const import ( CONF_ADDRESS, CONF_DEVICE_CLASS, CONF_NAME, DEVICE_DEFAULT_NAME) import homeassistant.helpers.config_validation as cv +from . import ( + CONF_BOARD, CONF_CHANNELS, CONF_I2C_HATS, CONF_INDEX, CONF_INVERT_LOGIC, + I2C_HAT_NAMES, I2C_HATS_MANAGER, I2CHatsException) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['raspihats'] diff --git a/homeassistant/components/raspihats/switch.py b/homeassistant/components/raspihats/switch.py index 26fcda3c8..93538682a 100644 --- a/homeassistant/components/raspihats/switch.py +++ b/homeassistant/components/raspihats/switch.py @@ -3,14 +3,15 @@ import logging import voluptuous as vol -from homeassistant.components.raspihats import ( - CONF_BOARD, CONF_CHANNELS, CONF_I2C_HATS, CONF_INDEX, CONF_INITIAL_STATE, - CONF_INVERT_LOGIC, I2C_HAT_NAMES, I2C_HATS_MANAGER, I2CHatsException) from homeassistant.components.switch import PLATFORM_SCHEMA from homeassistant.const import CONF_ADDRESS, CONF_NAME, DEVICE_DEFAULT_NAME import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import ToggleEntity +from . import ( + CONF_BOARD, CONF_CHANNELS, CONF_I2C_HATS, CONF_INDEX, CONF_INITIAL_STATE, + CONF_INVERT_LOGIC, I2C_HAT_NAMES, I2C_HATS_MANAGER, I2CHatsException) + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['raspihats'] diff --git a/homeassistant/components/rest/binary_sensor.py b/homeassistant/components/rest/binary_sensor.py index 1599d5bce..1a9415929 100644 --- a/homeassistant/components/rest/binary_sensor.py +++ b/homeassistant/components/rest/binary_sensor.py @@ -6,19 +6,20 @@ https://home-assistant.io/components/binary_sensor.rest/ """ import logging -import voluptuous as vol from requests.auth import HTTPBasicAuth, HTTPDigestAuth +import voluptuous as vol from homeassistant.components.binary_sensor import ( - BinarySensorDevice, DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA) -from homeassistant.components.rest.sensor import RestData + DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import ( - CONF_PAYLOAD, CONF_NAME, CONF_VALUE_TEMPLATE, CONF_METHOD, CONF_RESOURCE, - CONF_VERIFY_SSL, CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT, - CONF_HEADERS, CONF_AUTHENTICATION, HTTP_BASIC_AUTHENTICATION, - HTTP_DIGEST_AUTHENTICATION, CONF_DEVICE_CLASS) -import homeassistant.helpers.config_validation as cv + CONF_AUTHENTICATION, CONF_DEVICE_CLASS, CONF_HEADERS, CONF_METHOD, + CONF_NAME, CONF_PASSWORD, CONF_PAYLOAD, CONF_RESOURCE, CONF_TIMEOUT, + CONF_USERNAME, CONF_VALUE_TEMPLATE, CONF_VERIFY_SSL, + HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION) from homeassistant.exceptions import PlatformNotReady +import homeassistant.helpers.config_validation as cv + +from .sensor import RestData _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rflink/binary_sensor.py b/homeassistant/components/rflink/binary_sensor.py index 73b912d62..5318642a5 100644 --- a/homeassistant/components/rflink/binary_sensor.py +++ b/homeassistant/components/rflink/binary_sensor.py @@ -10,13 +10,12 @@ import voluptuous as vol from homeassistant.components.binary_sensor import ( DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice) -from homeassistant.components.rflink import ( - CONF_ALIASES, CONF_DEVICES, RflinkDevice) -from homeassistant.const import ( - CONF_FORCE_UPDATE, CONF_NAME, CONF_DEVICE_CLASS) +from homeassistant.const import CONF_DEVICE_CLASS, CONF_FORCE_UPDATE, CONF_NAME import homeassistant.helpers.config_validation as cv import homeassistant.helpers.event as evt +from . import CONF_ALIASES, CONF_DEVICES, RflinkDevice + CONF_OFF_DELAY = 'off_delay' DEFAULT_FORCE_UPDATE = False diff --git a/homeassistant/components/rflink/cover.py b/homeassistant/components/rflink/cover.py index cdc7cac3a..f91ef1cc6 100644 --- a/homeassistant/components/rflink/cover.py +++ b/homeassistant/components/rflink/cover.py @@ -8,15 +8,15 @@ import logging import voluptuous as vol -from homeassistant.components.rflink import ( +from homeassistant.components.cover import PLATFORM_SCHEMA, CoverDevice +from homeassistant.const import CONF_NAME, STATE_OPEN +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.restore_state import RestoreEntity + +from . import ( CONF_ALIASES, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT, CONF_GROUP, CONF_GROUP_ALIASES, CONF_NOGROUP_ALIASES, CONF_SIGNAL_REPETITIONS, DEVICE_DEFAULTS_SCHEMA, RflinkCommand) -from homeassistant.components.cover import ( - CoverDevice, PLATFORM_SCHEMA) -import homeassistant.helpers.config_validation as cv -from homeassistant.helpers.restore_state import RestoreEntity -from homeassistant.const import CONF_NAME, STATE_OPEN DEPENDENCIES = ['rflink'] diff --git a/homeassistant/components/rflink/light.py b/homeassistant/components/rflink/light.py index 726433b4f..cdb34328b 100644 --- a/homeassistant/components/rflink/light.py +++ b/homeassistant/components/rflink/light.py @@ -10,15 +10,15 @@ import voluptuous as vol from homeassistant.components.light import ( ATTR_BRIGHTNESS, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, Light) -from homeassistant.components.rflink import ( +from homeassistant.const import CONF_NAME, CONF_TYPE +import homeassistant.helpers.config_validation as cv + +from . import ( CONF_ALIASES, CONF_ALIASSES, CONF_AUTOMATIC_ADD, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT, CONF_GROUP, CONF_GROUP_ALIASES, CONF_GROUP_ALIASSES, CONF_NOGROUP_ALIASES, CONF_NOGROUP_ALIASSES, CONF_SIGNAL_REPETITIONS, DATA_DEVICE_REGISTER, DEVICE_DEFAULTS_SCHEMA, - EVENT_KEY_COMMAND, EVENT_KEY_ID, SwitchableRflinkDevice, - remove_deprecated) -import homeassistant.helpers.config_validation as cv -from homeassistant.const import (CONF_NAME, CONF_TYPE) + EVENT_KEY_COMMAND, EVENT_KEY_ID, SwitchableRflinkDevice, remove_deprecated) DEPENDENCIES = ['rflink'] diff --git a/homeassistant/components/rflink/sensor.py b/homeassistant/components/rflink/sensor.py index f3ec776fd..e46cc09d0 100644 --- a/homeassistant/components/rflink/sensor.py +++ b/homeassistant/components/rflink/sensor.py @@ -8,17 +8,17 @@ import logging import voluptuous as vol -from homeassistant.components.rflink import ( - CONF_ALIASES, CONF_ALIASSES, CONF_AUTOMATIC_ADD, CONF_DEVICES, - DATA_DEVICE_REGISTER, DATA_ENTITY_LOOKUP, EVENT_KEY_ID, - EVENT_KEY_SENSOR, EVENT_KEY_UNIT, RflinkDevice, remove_deprecated, - SIGNAL_AVAILABILITY, SIGNAL_HANDLE_EVENT, TMP_ENTITY) -from homeassistant.components.sensor import ( - PLATFORM_SCHEMA) -import homeassistant.helpers.config_validation as cv +from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, CONF_NAME, CONF_UNIT_OF_MEASUREMENT) -from homeassistant.helpers.dispatcher import (async_dispatcher_connect) +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ( + CONF_ALIASES, CONF_ALIASSES, CONF_AUTOMATIC_ADD, CONF_DEVICES, + DATA_DEVICE_REGISTER, DATA_ENTITY_LOOKUP, EVENT_KEY_ID, EVENT_KEY_SENSOR, + EVENT_KEY_UNIT, SIGNAL_AVAILABILITY, SIGNAL_HANDLE_EVENT, TMP_ENTITY, + RflinkDevice, remove_deprecated) DEPENDENCIES = ['rflink'] diff --git a/homeassistant/components/rflink/switch.py b/homeassistant/components/rflink/switch.py index 25e4e367f..a1470bf11 100644 --- a/homeassistant/components/rflink/switch.py +++ b/homeassistant/components/rflink/switch.py @@ -8,15 +8,15 @@ import logging import voluptuous as vol -from homeassistant.components.rflink import ( +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +from homeassistant.const import CONF_NAME +import homeassistant.helpers.config_validation as cv + +from . import ( CONF_ALIASES, CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT, CONF_GROUP, CONF_GROUP_ALIASES, CONF_GROUP_ALIASSES, CONF_NOGROUP_ALIASES, CONF_NOGROUP_ALIASSES, CONF_SIGNAL_REPETITIONS, DEVICE_DEFAULTS_SCHEMA, SwitchableRflinkDevice, remove_deprecated) -from homeassistant.components.switch import ( - PLATFORM_SCHEMA, SwitchDevice) -import homeassistant.helpers.config_validation as cv -from homeassistant.const import CONF_NAME DEPENDENCIES = ['rflink'] diff --git a/homeassistant/components/rfxtrx/binary_sensor.py b/homeassistant/components/rfxtrx/binary_sensor.py index 9a49bd02b..d548897fb 100644 --- a/homeassistant/components/rfxtrx/binary_sensor.py +++ b/homeassistant/components/rfxtrx/binary_sensor.py @@ -6,15 +6,14 @@ import voluptuous as vol from homeassistant.components import rfxtrx from homeassistant.components.binary_sensor import ( DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice) -from homeassistant.components.rfxtrx import ( - ATTR_NAME, CONF_AUTOMATIC_ADD, CONF_DATA_BITS, CONF_DEVICES, - CONF_FIRE_EVENT, CONF_OFF_DELAY) from homeassistant.const import ( CONF_COMMAND_OFF, CONF_COMMAND_ON, CONF_DEVICE_CLASS, CONF_NAME) -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers import event as evt -from homeassistant.util import dt as dt_util -from homeassistant.util import slugify +from homeassistant.helpers import config_validation as cv, event as evt +from homeassistant.util import dt as dt_util, slugify + +from . import ( + ATTR_NAME, CONF_AUTOMATIC_ADD, CONF_DATA_BITS, CONF_DEVICES, + CONF_FIRE_EVENT, CONF_OFF_DELAY) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rfxtrx/cover.py b/homeassistant/components/rfxtrx/cover.py index 5a6579236..7ac0e2aa4 100644 --- a/homeassistant/components/rfxtrx/cover.py +++ b/homeassistant/components/rfxtrx/cover.py @@ -2,13 +2,14 @@ import voluptuous as vol from homeassistant.components import rfxtrx -from homeassistant.components.cover import CoverDevice, PLATFORM_SCHEMA +from homeassistant.components.cover import PLATFORM_SCHEMA, CoverDevice from homeassistant.const import CONF_NAME -from homeassistant.components.rfxtrx import ( - CONF_AUTOMATIC_ADD, CONF_FIRE_EVENT, DEFAULT_SIGNAL_REPETITIONS, - CONF_SIGNAL_REPETITIONS, CONF_DEVICES) from homeassistant.helpers import config_validation as cv +from . import ( + CONF_AUTOMATIC_ADD, CONF_DEVICES, CONF_FIRE_EVENT, CONF_SIGNAL_REPETITIONS, + DEFAULT_SIGNAL_REPETITIONS) + DEPENDENCIES = ['rfxtrx'] PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ diff --git a/homeassistant/components/rfxtrx/light.py b/homeassistant/components/rfxtrx/light.py index d0b75c2f9..3320a6721 100644 --- a/homeassistant/components/rfxtrx/light.py +++ b/homeassistant/components/rfxtrx/light.py @@ -5,13 +5,14 @@ import voluptuous as vol from homeassistant.components import rfxtrx from homeassistant.components.light import ( - ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light, PLATFORM_SCHEMA) + ATTR_BRIGHTNESS, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, Light) from homeassistant.const import CONF_NAME -from homeassistant.components.rfxtrx import ( - CONF_AUTOMATIC_ADD, CONF_FIRE_EVENT, DEFAULT_SIGNAL_REPETITIONS, - CONF_SIGNAL_REPETITIONS, CONF_DEVICES) from homeassistant.helpers import config_validation as cv +from . import ( + CONF_AUTOMATIC_ADD, CONF_DEVICES, CONF_FIRE_EVENT, CONF_SIGNAL_REPETITIONS, + DEFAULT_SIGNAL_REPETITIONS) + DEPENDENCIES = ['rfxtrx'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rfxtrx/sensor.py b/homeassistant/components/rfxtrx/sensor.py index 74c646355..cc54320cb 100644 --- a/homeassistant/components/rfxtrx/sensor.py +++ b/homeassistant/components/rfxtrx/sensor.py @@ -4,15 +4,16 @@ import logging import voluptuous as vol from homeassistant.components import rfxtrx -from homeassistant.components.rfxtrx import ( - ATTR_DATA_TYPE, ATTR_FIRE_EVENT, CONF_AUTOMATIC_ADD, CONF_DATA_TYPE, - CONF_DEVICES, CONF_FIRE_EVENT, DATA_TYPES) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ATTR_ENTITY_ID, ATTR_NAME, CONF_NAME import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.util import slugify +from . import ( + ATTR_DATA_TYPE, ATTR_FIRE_EVENT, CONF_AUTOMATIC_ADD, CONF_DATA_TYPE, + CONF_DEVICES, CONF_FIRE_EVENT, DATA_TYPES) + DEPENDENCIES = ['rfxtrx'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/rfxtrx/switch.py b/homeassistant/components/rfxtrx/switch.py index 141cf2c2c..908c07ea7 100644 --- a/homeassistant/components/rfxtrx/switch.py +++ b/homeassistant/components/rfxtrx/switch.py @@ -4,12 +4,13 @@ import logging import voluptuous as vol from homeassistant.components import rfxtrx -from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA -from homeassistant.components.rfxtrx import ( - CONF_AUTOMATIC_ADD, CONF_FIRE_EVENT, DEFAULT_SIGNAL_REPETITIONS, - CONF_SIGNAL_REPETITIONS, CONF_DEVICES) -from homeassistant.helpers import config_validation as cv +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import CONF_NAME +from homeassistant.helpers import config_validation as cv + +from . import ( + CONF_AUTOMATIC_ADD, CONF_DEVICES, CONF_FIRE_EVENT, CONF_SIGNAL_REPETITIONS, + DEFAULT_SIGNAL_REPETITIONS) DEPENDENCIES = ['rfxtrx'] diff --git a/homeassistant/components/ring/binary_sensor.py b/homeassistant/components/ring/binary_sensor.py index 79fc61a62..bcc365a2e 100644 --- a/homeassistant/components/ring/binary_sensor.py +++ b/homeassistant/components/ring/binary_sensor.py @@ -4,20 +4,18 @@ This component provides HA sensor support for Ring Door Bell/Chimes. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/binary_sensor.ring/ """ -import logging from datetime import timedelta +import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv - -from homeassistant.components.ring import ( - ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE, DATA_RING) - -from homeassistant.const import ( - ATTR_ATTRIBUTION, CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS) from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) + PLATFORM_SCHEMA, BinarySensorDevice) +from homeassistant.const import ( + ATTR_ATTRIBUTION, CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS) +import homeassistant.helpers.config_validation as cv + +from . import ATTRIBUTION, DATA_RING, DEFAULT_ENTITY_NAMESPACE DEPENDENCIES = ['ring'] diff --git a/homeassistant/components/ring/camera.py b/homeassistant/components/ring/camera.py index ce9ceb7b7..efcdf8599 100644 --- a/homeassistant/components/ring/camera.py +++ b/homeassistant/components/ring/camera.py @@ -5,21 +5,20 @@ For more details about this platform, please refer to the documentation at https://home-assistant.io/components/camera.ring/ """ import asyncio -import logging - from datetime import timedelta +import logging import voluptuous as vol -from homeassistant.helpers import config_validation as cv -from homeassistant.components.ring import ( - DATA_RING, ATTRIBUTION, NOTIFICATION_ID) -from homeassistant.components.camera import Camera, PLATFORM_SCHEMA +from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.components.ffmpeg import DATA_FFMPEG from homeassistant.const import ATTR_ATTRIBUTION, CONF_SCAN_INTERVAL +from homeassistant.helpers import config_validation as cv from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream from homeassistant.util import dt as dt_util +from . import ATTRIBUTION, DATA_RING, NOTIFICATION_ID + CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments' DEPENDENCIES = ['ring', 'ffmpeg'] diff --git a/homeassistant/components/ring/sensor.py b/homeassistant/components/ring/sensor.py index d58e0cf8b..5e323d89a 100644 --- a/homeassistant/components/ring/sensor.py +++ b/homeassistant/components/ring/sensor.py @@ -9,16 +9,15 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.ring import ( - ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE, DATA_RING) from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS, - ATTR_ATTRIBUTION) + ATTR_ATTRIBUTION, CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.helpers.icon import icon_for_battery_level +from . import ATTRIBUTION, DATA_RING, DEFAULT_ENTITY_NAMESPACE + DEPENDENCIES = ['ring'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/sabnzbd/sensor.py b/homeassistant/components/sabnzbd/sensor.py index ca8fc64ee..4968725a4 100644 --- a/homeassistant/components/sabnzbd/sensor.py +++ b/homeassistant/components/sabnzbd/sensor.py @@ -1,11 +1,11 @@ """Support for monitoring an SABnzbd NZB client.""" import logging -from homeassistant.components.sabnzbd import DATA_SABNZBD, \ - SIGNAL_SABNZBD_UPDATED, SENSOR_TYPES from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity +from . import DATA_SABNZBD, SENSOR_TYPES, SIGNAL_SABNZBD_UPDATED + DEPENDENCIES = ['sabnzbd'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/scene/__init__.py b/homeassistant/components/scene/__init__.py index 35eedabd5..86392c090 100644 --- a/homeassistant/components/scene/__init__.py +++ b/homeassistant/components/scene/__init__.py @@ -5,8 +5,7 @@ import logging import voluptuous as vol -from homeassistant.const import ( - ATTR_ENTITY_ID, CONF_PLATFORM, SERVICE_TURN_ON) +from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM, SERVICE_TURN_ON import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity_component import EntityComponent @@ -28,9 +27,8 @@ def _hass_domain_validator(config): def _platform_validator(config): """Validate it is a valid platform.""" try: - platform = importlib.import_module( - 'homeassistant.components.scene.{}'.format( - config[CONF_PLATFORM])) + platform = importlib.import_module('.{}'.format(config[CONF_PLATFORM]), + __name__) except ImportError: try: platform = importlib.import_module( diff --git a/homeassistant/components/scene/homeassistant.py b/homeassistant/components/scene/homeassistant.py index 96e24138b..86af6c346 100644 --- a/homeassistant/components/scene/homeassistant.py +++ b/homeassistant/components/scene/homeassistant.py @@ -3,13 +3,14 @@ from collections import namedtuple import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.scene import Scene, STATES from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_STATE, CONF_ENTITIES, CONF_NAME, CONF_PLATFORM, STATE_OFF, STATE_ON) from homeassistant.core import State -from homeassistant.helpers.state import async_reproduce_state, HASS_DOMAIN +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.state import HASS_DOMAIN, async_reproduce_state + +from . import STATES, Scene PLATFORM_SCHEMA = vol.Schema({ vol.Required(CONF_PLATFORM): HASS_DOMAIN, diff --git a/homeassistant/components/sense/binary_sensor.py b/homeassistant/components/sense/binary_sensor.py index 0341f65e9..da9bae3cc 100644 --- a/homeassistant/components/sense/binary_sensor.py +++ b/homeassistant/components/sense/binary_sensor.py @@ -2,7 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.sense import SENSE_DATA + +from . import SENSE_DATA DEPENDENCIES = ['sense'] diff --git a/homeassistant/components/sense/sensor.py b/homeassistant/components/sense/sensor.py index ffde584c0..0224884e1 100644 --- a/homeassistant/components/sense/sensor.py +++ b/homeassistant/components/sense/sensor.py @@ -2,11 +2,12 @@ from datetime import timedelta import logging -from homeassistant.components.sense import SENSE_DATA -from homeassistant.const import POWER_WATT, ENERGY_KILO_WATT_HOUR +from homeassistant.const import ENERGY_KILO_WATT_HOUR, POWER_WATT from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle +from . import SENSE_DATA + _LOGGER = logging.getLogger(__name__) ACTIVE_NAME = 'Energy' diff --git a/homeassistant/components/simplisafe/alarm_control_panel.py b/homeassistant/components/simplisafe/alarm_control_panel.py index 9fdeea73d..693117786 100644 --- a/homeassistant/components/simplisafe/alarm_control_panel.py +++ b/homeassistant/components/simplisafe/alarm_control_panel.py @@ -3,14 +3,14 @@ import logging import re import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.simplisafe.const import ( - DATA_CLIENT, DOMAIN, TOPIC_UPDATE) from homeassistant.const import ( CONF_CODE, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect +from .const import DATA_CLIENT, DOMAIN, TOPIC_UPDATE + _LOGGER = logging.getLogger(__name__) ATTR_ALARM_ACTIVE = 'alarm_active' diff --git a/homeassistant/components/sisyphus/light.py b/homeassistant/components/sisyphus/light.py index c9d209596..182e5e781 100644 --- a/homeassistant/components/sisyphus/light.py +++ b/homeassistant/components/sisyphus/light.py @@ -1,9 +1,10 @@ """Support for the light on the Sisyphus Kinetic Art Table.""" import logging -from homeassistant.const import CONF_NAME from homeassistant.components.light import SUPPORT_BRIGHTNESS, Light -from homeassistant.components.sisyphus import DATA_SISYPHUS +from homeassistant.const import CONF_NAME + +from . import DATA_SISYPHUS _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/sisyphus/media_player.py b/homeassistant/components/sisyphus/media_player.py index 463ac2b6c..11546c3fd 100644 --- a/homeassistant/components/sisyphus/media_player.py +++ b/homeassistant/components/sisyphus/media_player.py @@ -6,10 +6,11 @@ from homeassistant.components.media_player.const import ( SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_SHUFFLE_SET, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET) -from homeassistant.components.sisyphus import DATA_SISYPHUS from homeassistant.const import ( CONF_HOST, CONF_NAME, STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING) +from . import DATA_SISYPHUS + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['sisyphus'] diff --git a/homeassistant/components/skybell/binary_sensor.py b/homeassistant/components/skybell/binary_sensor.py index 169e1b51a..8c2b83552 100644 --- a/homeassistant/components/skybell/binary_sensor.py +++ b/homeassistant/components/skybell/binary_sensor.py @@ -5,13 +5,13 @@ import logging import voluptuous as vol from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) -from homeassistant.components.skybell import ( - DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice) + PLATFORM_SCHEMA, BinarySensorDevice) from homeassistant.const import ( CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS) import homeassistant.helpers.config_validation as cv +from . import DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice + DEPENDENCIES = ['skybell'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/skybell/camera.py b/homeassistant/components/skybell/camera.py index c22489aa6..04b03f84b 100644 --- a/homeassistant/components/skybell/camera.py +++ b/homeassistant/components/skybell/camera.py @@ -5,13 +5,11 @@ import logging import requests import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA +from homeassistant.components.camera import PLATFORM_SCHEMA, Camera from homeassistant.const import CONF_MONITORED_CONDITIONS import homeassistant.helpers.config_validation as cv -from homeassistant.components.camera import Camera -from homeassistant.components.skybell import ( - DOMAIN as SKYBELL_DOMAIN, SkybellDevice) +from . import DOMAIN as SKYBELL_DOMAIN, SkybellDevice DEPENDENCIES = ['skybell'] diff --git a/homeassistant/components/skybell/light.py b/homeassistant/components/skybell/light.py index 02be279f6..d413f9df4 100644 --- a/homeassistant/components/skybell/light.py +++ b/homeassistant/components/skybell/light.py @@ -1,14 +1,12 @@ """Light/LED support for the Skybell HD Doorbell.""" import logging - from homeassistant.components.light import ( - ATTR_BRIGHTNESS, ATTR_HS_COLOR, - SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light) -from homeassistant.components.skybell import ( - DOMAIN as SKYBELL_DOMAIN, SkybellDevice) + ATTR_BRIGHTNESS, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light) import homeassistant.util.color as color_util +from . import DOMAIN as SKYBELL_DOMAIN, SkybellDevice + DEPENDENCIES = ['skybell'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/skybell/sensor.py b/homeassistant/components/skybell/sensor.py index 89841ae74..067e850df 100644 --- a/homeassistant/components/skybell/sensor.py +++ b/homeassistant/components/skybell/sensor.py @@ -5,12 +5,12 @@ import logging import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.components.skybell import ( - DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice) from homeassistant.const import ( CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS) import homeassistant.helpers.config_validation as cv +from . import DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice + DEPENDENCIES = ['skybell'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/skybell/switch.py b/homeassistant/components/skybell/switch.py index 32f1d7f93..674bbf22a 100644 --- a/homeassistant/components/skybell/switch.py +++ b/homeassistant/components/skybell/switch.py @@ -3,14 +3,13 @@ import logging import voluptuous as vol - -from homeassistant.components.skybell import ( - DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice) from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import ( CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS) import homeassistant.helpers.config_validation as cv +from . import DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice + DEPENDENCIES = ['skybell'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/smappee/sensor.py b/homeassistant/components/smappee/sensor.py index 09584851c..98527c769 100644 --- a/homeassistant/components/smappee/sensor.py +++ b/homeassistant/components/smappee/sensor.py @@ -1,10 +1,11 @@ """Support for monitoring a Smappee energy sensor.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.smappee import DATA_SMAPPEE +from homeassistant.const import ENERGY_KILO_WATT_HOUR, POWER_WATT from homeassistant.helpers.entity import Entity -from homeassistant.const import POWER_WATT, ENERGY_KILO_WATT_HOUR + +from . import DATA_SMAPPEE DEPENDENCIES = ['smappee'] diff --git a/homeassistant/components/smappee/switch.py b/homeassistant/components/smappee/switch.py index 3b9bee081..963caf457 100644 --- a/homeassistant/components/smappee/switch.py +++ b/homeassistant/components/smappee/switch.py @@ -1,8 +1,9 @@ """Support for interacting with Smappee Comport Plugs.""" import logging -from homeassistant.components.smappee import DATA_SMAPPEE -from homeassistant.components.switch import (SwitchDevice) +from homeassistant.components.switch import SwitchDevice + +from . import DATA_SMAPPEE DEPENDENCIES = ['smappee'] diff --git a/homeassistant/components/smhi/const.py b/homeassistant/components/smhi/const.py index 9689857e5..4cd1d6f7b 100644 --- a/homeassistant/components/smhi/const.py +++ b/homeassistant/components/smhi/const.py @@ -13,4 +13,4 @@ ENTITY_ID_SENSOR_FORMAT = WEATHER_DOMAIN + ".smhi_{}" ENTITY_ID_SENSOR_FORMAT_HOME = ENTITY_ID_SENSOR_FORMAT.format( HOME_LOCATION_NAME) -LOGGER = logging.getLogger('homeassistant.components.smhi') +LOGGER = logging.getLogger('.') diff --git a/homeassistant/components/smhi/weather.py b/homeassistant/components/smhi/weather.py index 6136d093a..fc3399f75 100644 --- a/homeassistant/components/smhi/weather.py +++ b/homeassistant/components/smhi/weather.py @@ -7,8 +7,6 @@ from typing import Dict, List import aiohttp import async_timeout -from homeassistant.components.smhi.const import ( - ATTR_SMHI_CLOUDINESS, ENTITY_ID_SENSOR_FORMAT) from homeassistant.components.weather import ( ATTR_FORECAST_CONDITION, ATTR_FORECAST_PRECIPITATION, ATTR_FORECAST_TEMP, ATTR_FORECAST_TEMP_LOW, ATTR_FORECAST_TIME, WeatherEntity) @@ -19,6 +17,8 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers import aiohttp_client from homeassistant.util import Throttle, slugify +from .const import ATTR_SMHI_CLOUDINESS, ENTITY_ID_SENSOR_FORMAT + DEPENDENCIES = ['smhi'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py index 684e25ba5..ba7854e4f 100644 --- a/homeassistant/components/sonos/media_player.py +++ b/homeassistant/components/sonos/media_player.py @@ -1,9 +1,9 @@ """Support to interface with Sonos players.""" +import asyncio import datetime import functools as ft import logging import socket -import asyncio import urllib import async_timeout @@ -11,20 +11,20 @@ import requests import voluptuous as vol from homeassistant.components.media_player import ( - MediaPlayerDevice, PLATFORM_SCHEMA) + PLATFORM_SCHEMA, MediaPlayerDevice) from homeassistant.components.media_player.const import ( - ATTR_MEDIA_ENQUEUE, DOMAIN, MEDIA_TYPE_MUSIC, - SUPPORT_CLEAR_PLAYLIST, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, - SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, - SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET, SUPPORT_STOP, - SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET) -from homeassistant.components.sonos import DOMAIN as SONOS_DOMAIN + ATTR_MEDIA_ENQUEUE, DOMAIN, MEDIA_TYPE_MUSIC, SUPPORT_CLEAR_PLAYLIST, + SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, + SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_SELECT_SOURCE, + SUPPORT_SHUFFLE_SET, SUPPORT_STOP, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET) from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_TIME, CONF_HOSTS, STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING) import homeassistant.helpers.config_validation as cv from homeassistant.util.dt import utcnow +from . import DOMAIN as SONOS_DOMAIN + DEPENDENCIES = ('sonos',) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/spc/alarm_control_panel.py b/homeassistant/components/spc/alarm_control_panel.py index 7adbb6167..623a4b0db 100644 --- a/homeassistant/components/spc/alarm_control_panel.py +++ b/homeassistant/components/spc/alarm_control_panel.py @@ -7,12 +7,13 @@ https://home-assistant.io/components/alarm_control_panel.spc/ import logging import homeassistant.components.alarm_control_panel as alarm -from homeassistant.helpers.dispatcher import async_dispatcher_connect -from homeassistant.core import callback -from homeassistant.components.spc import (DATA_API, SIGNAL_UPDATE_ALARM) from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED) +from homeassistant.core import callback +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import DATA_API, SIGNAL_UPDATE_ALARM _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/spc/binary_sensor.py b/homeassistant/components/spc/binary_sensor.py index baa252668..6a0712d62 100644 --- a/homeassistant/components/spc/binary_sensor.py +++ b/homeassistant/components/spc/binary_sensor.py @@ -7,9 +7,10 @@ https://home-assistant.io/components/binary_sensor.spc/ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.core import callback -from homeassistant.components.spc import (DATA_API, SIGNAL_UPDATE_SENSOR) +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import DATA_API, SIGNAL_UPDATE_SENSOR _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/speedtestdotnet/__init__.py b/homeassistant/components/speedtestdotnet/__init__.py index 0c8908a30..f140f881e 100644 --- a/homeassistant/components/speedtestdotnet/__init__.py +++ b/homeassistant/components/speedtestdotnet/__init__.py @@ -5,8 +5,6 @@ import logging import voluptuous as vol from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN -from homeassistant.components.speedtestdotnet.const import ( - DATA_UPDATED, DOMAIN, SENSOR_TYPES) from homeassistant.const import ( CONF_MONITORED_CONDITIONS, CONF_SCAN_INTERVAL, CONF_UPDATE_INTERVAL, CONF_UPDATE_INTERVAL_INVALIDATION_VERSION) @@ -15,6 +13,8 @@ from homeassistant.helpers.discovery import async_load_platform from homeassistant.helpers.dispatcher import dispatcher_send from homeassistant.helpers.event import async_track_time_interval +from .const import DATA_UPDATED, DOMAIN, SENSOR_TYPES + REQUIREMENTS = ['speedtest-cli==2.1.1'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/speedtestdotnet/sensor.py b/homeassistant/components/speedtestdotnet/sensor.py index 11bc9a37c..fb92bb76a 100644 --- a/homeassistant/components/speedtestdotnet/sensor.py +++ b/homeassistant/components/speedtestdotnet/sensor.py @@ -1,13 +1,14 @@ """Support for Speedtest.net internet speed testing sensor.""" import logging -from homeassistant.components.speedtestdotnet.const import ( - DATA_UPDATED, DOMAIN as SPEEDTESTDOTNET_DOMAIN, SENSOR_TYPES) from homeassistant.const import ATTR_ATTRIBUTION from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.restore_state import RestoreEntity +from .const import ( + DATA_UPDATED, DOMAIN as SPEEDTESTDOTNET_DOMAIN, SENSOR_TYPES) + DEPENDENCIES = ['speedtestdotnet'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/spider/climate.py b/homeassistant/components/spider/climate.py index b3380ec8f..3b612441a 100644 --- a/homeassistant/components/spider/climate.py +++ b/homeassistant/components/spider/climate.py @@ -4,12 +4,12 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - STATE_COOL, STATE_HEAT, STATE_IDLE, - SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, - SUPPORT_FAN_MODE) -from homeassistant.components.spider import DOMAIN as SPIDER_DOMAIN + STATE_COOL, STATE_HEAT, STATE_IDLE, SUPPORT_FAN_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS +from . import DOMAIN as SPIDER_DOMAIN + DEPENDENCIES = ['spider'] FAN_LIST = [ diff --git a/homeassistant/components/spider/switch.py b/homeassistant/components/spider/switch.py index 227e47485..e43762be4 100644 --- a/homeassistant/components/spider/switch.py +++ b/homeassistant/components/spider/switch.py @@ -1,9 +1,10 @@ """Support for Spider switches.""" import logging -from homeassistant.components.spider import DOMAIN as SPIDER_DOMAIN from homeassistant.components.switch import SwitchDevice +from . import DOMAIN as SPIDER_DOMAIN + DEPENDENCIES = ['spider'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py index d5f152bbd..71ebeadae 100644 --- a/homeassistant/components/tado/climate.py +++ b/homeassistant/components/tado/climate.py @@ -1,13 +1,14 @@ """Support for Tado to create a climate device for each zone.""" import logging -from homeassistant.const import (PRECISION_TENTHS, TEMP_CELSIUS) from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( - SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE) + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) +from homeassistant.const import ( + ATTR_TEMPERATURE, PRECISION_TENTHS, TEMP_CELSIUS) from homeassistant.util.temperature import convert as convert_temperature -from homeassistant.const import ATTR_TEMPERATURE -from homeassistant.components.tado import DATA_TADO + +from . import DATA_TADO _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tado/sensor.py b/homeassistant/components/tado/sensor.py index a1eb918ac..8fa858977 100644 --- a/homeassistant/components/tado/sensor.py +++ b/homeassistant/components/tado/sensor.py @@ -1,10 +1,11 @@ """Support for Tado sensors for each zone.""" import logging -from homeassistant.components.tado import DATA_TADO from homeassistant.const import ATTR_ID, ATTR_NAME, TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import DATA_TADO + _LOGGER = logging.getLogger(__name__) ATTR_DATA_ID = 'data_id' diff --git a/homeassistant/components/tahoma/binary_sensor.py b/homeassistant/components/tahoma/binary_sensor.py index 69855f7cb..948c6f90a 100644 --- a/homeassistant/components/tahoma/binary_sensor.py +++ b/homeassistant/components/tahoma/binary_sensor.py @@ -1,12 +1,11 @@ """Support for Tahoma binary sensors.""" -import logging from datetime import timedelta +import logging -from homeassistant.components.binary_sensor import ( - BinarySensorDevice) -from homeassistant.components.tahoma import ( - DOMAIN as TAHOMA_DOMAIN, TahomaDevice) -from homeassistant.const import (STATE_OFF, STATE_ON, ATTR_BATTERY_LEVEL) +from homeassistant.components.binary_sensor import BinarySensorDevice +from homeassistant.const import ATTR_BATTERY_LEVEL, STATE_OFF, STATE_ON + +from . import DOMAIN as TAHOMA_DOMAIN, TahomaDevice DEPENDENCIES = ['tahoma'] diff --git a/homeassistant/components/tahoma/cover.py b/homeassistant/components/tahoma/cover.py index 6dbf9a398..85e785f9c 100644 --- a/homeassistant/components/tahoma/cover.py +++ b/homeassistant/components/tahoma/cover.py @@ -2,10 +2,10 @@ from datetime import timedelta import logging +from homeassistant.components.cover import ATTR_POSITION, CoverDevice from homeassistant.util.dt import utcnow -from homeassistant.components.cover import CoverDevice, ATTR_POSITION -from homeassistant.components.tahoma import ( - DOMAIN as TAHOMA_DOMAIN, TahomaDevice) + +from . import DOMAIN as TAHOMA_DOMAIN, TahomaDevice DEPENDENCIES = ['tahoma'] diff --git a/homeassistant/components/tahoma/scene.py b/homeassistant/components/tahoma/scene.py index 643cc65aa..eedb95d1a 100644 --- a/homeassistant/components/tahoma/scene.py +++ b/homeassistant/components/tahoma/scene.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.scene import Scene -from homeassistant.components.tahoma import ( - DOMAIN as TAHOMA_DOMAIN) + +from . import DOMAIN as TAHOMA_DOMAIN DEPENDENCIES = ['tahoma'] diff --git a/homeassistant/components/tahoma/sensor.py b/homeassistant/components/tahoma/sensor.py index 8a2ea976b..3c0391180 100644 --- a/homeassistant/components/tahoma/sensor.py +++ b/homeassistant/components/tahoma/sensor.py @@ -1,11 +1,11 @@ """Support for Tahoma sensors.""" -import logging from datetime import timedelta +import logging -from homeassistant.helpers.entity import Entity -from homeassistant.components.tahoma import ( - DOMAIN as TAHOMA_DOMAIN, TahomaDevice) from homeassistant.const import ATTR_BATTERY_LEVEL +from homeassistant.helpers.entity import Entity + +from . import DOMAIN as TAHOMA_DOMAIN, TahomaDevice DEPENDENCIES = ['tahoma'] diff --git a/homeassistant/components/tahoma/switch.py b/homeassistant/components/tahoma/switch.py index 779bff9ce..71f00ed89 100644 --- a/homeassistant/components/tahoma/switch.py +++ b/homeassistant/components/tahoma/switch.py @@ -2,9 +2,9 @@ import logging from homeassistant.components.switch import SwitchDevice -from homeassistant.components.tahoma import ( - DOMAIN as TAHOMA_DOMAIN, TahomaDevice) -from homeassistant.const import (STATE_OFF, STATE_ON) +from homeassistant.const import STATE_OFF, STATE_ON + +from . import DOMAIN as TAHOMA_DOMAIN, TahomaDevice DEPENDENCIES = ['tahoma'] diff --git a/homeassistant/components/tcp/binary_sensor.py b/homeassistant/components/tcp/binary_sensor.py index 4a12febd8..80d77cd52 100644 --- a/homeassistant/components/tcp/binary_sensor.py +++ b/homeassistant/components/tcp/binary_sensor.py @@ -7,8 +7,8 @@ https://home-assistant.io/components/binary_sensor.tcp/ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.tcp.sensor import ( - TcpSensor, CONF_VALUE_ON, PLATFORM_SCHEMA) + +from .sensor import CONF_VALUE_ON, PLATFORM_SCHEMA, TcpSensor _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/telegram_bot/broadcast.py b/homeassistant/components/telegram_bot/broadcast.py index eb52ab496..a129ebf66 100644 --- a/homeassistant/components/telegram_bot/broadcast.py +++ b/homeassistant/components/telegram_bot/broadcast.py @@ -1,9 +1,7 @@ """Support for Telegram bot to send messages only.""" import logging -from homeassistant.components.telegram_bot import ( - initialize_bot, - PLATFORM_SCHEMA as TELEGRAM_PLATFORM_SCHEMA) +from . import PLATFORM_SCHEMA as TELEGRAM_PLATFORM_SCHEMA, initialize_bot _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/telegram_bot/polling.py b/homeassistant/components/telegram_bot/polling.py index 9936b6909..7d0039319 100644 --- a/homeassistant/components/telegram_bot/polling.py +++ b/homeassistant/components/telegram_bot/polling.py @@ -1,14 +1,14 @@ """Support for Telegram bot using polling.""" import logging -from homeassistant.components.telegram_bot import ( - initialize_bot, - CONF_ALLOWED_CHAT_IDS, BaseTelegramBotEntity, - PLATFORM_SCHEMA as TELEGRAM_PLATFORM_SCHEMA) from homeassistant.const import ( EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP) from homeassistant.core import callback +from . import ( + CONF_ALLOWED_CHAT_IDS, PLATFORM_SCHEMA as TELEGRAM_PLATFORM_SCHEMA, + BaseTelegramBotEntity, initialize_bot) + _LOGGER = logging.getLogger(__name__) PLATFORM_SCHEMA = TELEGRAM_PLATFORM_SCHEMA diff --git a/homeassistant/components/telegram_bot/webhooks.py b/homeassistant/components/telegram_bot/webhooks.py index 41a206944..424ece815 100644 --- a/homeassistant/components/telegram_bot/webhooks.py +++ b/homeassistant/components/telegram_bot/webhooks.py @@ -7,14 +7,14 @@ import voluptuous as vol from homeassistant.components.http import HomeAssistantView from homeassistant.components.http.const import KEY_REAL_IP -from homeassistant.components.telegram_bot import ( - CONF_ALLOWED_CHAT_IDS, BaseTelegramBotEntity, PLATFORM_SCHEMA, - initialize_bot) from homeassistant.const import ( - EVENT_HOMEASSISTANT_STOP, HTTP_BAD_REQUEST, - HTTP_UNAUTHORIZED, CONF_URL) + CONF_URL, EVENT_HOMEASSISTANT_STOP, HTTP_BAD_REQUEST, HTTP_UNAUTHORIZED) import homeassistant.helpers.config_validation as cv +from . import ( + CONF_ALLOWED_CHAT_IDS, PLATFORM_SCHEMA, BaseTelegramBotEntity, + initialize_bot) + DEPENDENCIES = ['http'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tellduslive/binary_sensor.py b/homeassistant/components/tellduslive/binary_sensor.py index 85faeca96..fc13f7583 100644 --- a/homeassistant/components/tellduslive/binary_sensor.py +++ b/homeassistant/components/tellduslive/binary_sensor.py @@ -3,9 +3,10 @@ import logging from homeassistant.components import binary_sensor, tellduslive from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.tellduslive.entry import TelldusLiveEntity from homeassistant.helpers.dispatcher import async_dispatcher_connect +from .entry import TelldusLiveEntity + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tellduslive/cover.py b/homeassistant/components/tellduslive/cover.py index 1bd3158d1..6dac00ed7 100644 --- a/homeassistant/components/tellduslive/cover.py +++ b/homeassistant/components/tellduslive/cover.py @@ -3,9 +3,10 @@ import logging from homeassistant.components import cover, tellduslive from homeassistant.components.cover import CoverDevice -from homeassistant.components.tellduslive.entry import TelldusLiveEntity from homeassistant.helpers.dispatcher import async_dispatcher_connect +from .entry import TelldusLiveEntity + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tellduslive/light.py b/homeassistant/components/tellduslive/light.py index 12baf8384..3847c66b6 100644 --- a/homeassistant/components/tellduslive/light.py +++ b/homeassistant/components/tellduslive/light.py @@ -4,9 +4,10 @@ import logging from homeassistant.components import light, tellduslive from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) -from homeassistant.components.tellduslive.entry import TelldusLiveEntity from homeassistant.helpers.dispatcher import async_dispatcher_connect +from .entry import TelldusLiveEntity + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tellduslive/sensor.py b/homeassistant/components/tellduslive/sensor.py index 42c93aa52..156c11c95 100644 --- a/homeassistant/components/tellduslive/sensor.py +++ b/homeassistant/components/tellduslive/sensor.py @@ -2,12 +2,13 @@ import logging from homeassistant.components import sensor, tellduslive -from homeassistant.components.tellduslive.entry import TelldusLiveEntity from homeassistant.const import ( DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE, - TEMP_CELSIUS, POWER_WATT) + POWER_WATT, TEMP_CELSIUS) from homeassistant.helpers.dispatcher import async_dispatcher_connect +from .entry import TelldusLiveEntity + _LOGGER = logging.getLogger(__name__) SENSOR_TYPE_TEMPERATURE = 'temp' diff --git a/homeassistant/components/tellduslive/switch.py b/homeassistant/components/tellduslive/switch.py index bb0164b10..55275b5b7 100644 --- a/homeassistant/components/tellduslive/switch.py +++ b/homeassistant/components/tellduslive/switch.py @@ -2,10 +2,11 @@ import logging from homeassistant.components import switch, tellduslive -from homeassistant.components.tellduslive.entry import TelldusLiveEntity from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import ToggleEntity +from .entry import TelldusLiveEntity + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tellstick/cover.py b/homeassistant/components/tellstick/cover.py index d0c9c0314..b90e34229 100644 --- a/homeassistant/components/tellstick/cover.py +++ b/homeassistant/components/tellstick/cover.py @@ -1,8 +1,9 @@ """Support for Tellstick covers.""" from homeassistant.components.cover import CoverDevice -from homeassistant.components.tellstick import ( - DEFAULT_SIGNAL_REPETITIONS, ATTR_DISCOVER_DEVICES, ATTR_DISCOVER_CONFIG, - DATA_TELLSTICK, TellstickDevice) + +from . import ( + ATTR_DISCOVER_CONFIG, ATTR_DISCOVER_DEVICES, DATA_TELLSTICK, + DEFAULT_SIGNAL_REPETITIONS, TellstickDevice) def setup_platform(hass, config, add_entities, discovery_info=None): diff --git a/homeassistant/components/tellstick/light.py b/homeassistant/components/tellstick/light.py index 5deee5e08..15c8b0c5e 100644 --- a/homeassistant/components/tellstick/light.py +++ b/homeassistant/components/tellstick/light.py @@ -1,10 +1,10 @@ """Support for Tellstick lights.""" from homeassistant.components.light import ( ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light) -from homeassistant.components.tellstick import ( - DEFAULT_SIGNAL_REPETITIONS, ATTR_DISCOVER_DEVICES, ATTR_DISCOVER_CONFIG, - DATA_TELLSTICK, TellstickDevice) +from . import ( + ATTR_DISCOVER_CONFIG, ATTR_DISCOVER_DEVICES, DATA_TELLSTICK, + DEFAULT_SIGNAL_REPETITIONS, TellstickDevice) SUPPORT_TELLSTICK = SUPPORT_BRIGHTNESS diff --git a/homeassistant/components/tellstick/switch.py b/homeassistant/components/tellstick/switch.py index 56d563e49..75c18bee8 100644 --- a/homeassistant/components/tellstick/switch.py +++ b/homeassistant/components/tellstick/switch.py @@ -1,9 +1,10 @@ """Support for Tellstick switches.""" -from homeassistant.components.tellstick import ( - DEFAULT_SIGNAL_REPETITIONS, ATTR_DISCOVER_DEVICES, - ATTR_DISCOVER_CONFIG, DATA_TELLSTICK, TellstickDevice) from homeassistant.helpers.entity import ToggleEntity +from . import ( + ATTR_DISCOVER_CONFIG, ATTR_DISCOVER_DEVICES, DATA_TELLSTICK, + DEFAULT_SIGNAL_REPETITIONS, TellstickDevice) + def setup_platform(hass, config, add_entities, discovery_info=None): """Set up Tellstick switches.""" diff --git a/homeassistant/components/tesla/binary_sensor.py b/homeassistant/components/tesla/binary_sensor.py index 2c037140f..a87239d24 100644 --- a/homeassistant/components/tesla/binary_sensor.py +++ b/homeassistant/components/tesla/binary_sensor.py @@ -2,8 +2,9 @@ import logging from homeassistant.components.binary_sensor import ( - BinarySensorDevice, ENTITY_ID_FORMAT) -from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN, TeslaDevice + ENTITY_ID_FORMAT, BinarySensorDevice) + +from . import DOMAIN as TESLA_DOMAIN, TeslaDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tesla/climate.py b/homeassistant/components/tesla/climate.py index 118e7204b..603ce1a4d 100644 --- a/homeassistant/components/tesla/climate.py +++ b/homeassistant/components/tesla/climate.py @@ -1,14 +1,14 @@ """Support for Tesla HVAC system.""" import logging -from homeassistant.components.climate import ClimateDevice, ENTITY_ID_FORMAT +from homeassistant.components.climate import ENTITY_ID_FORMAT, ClimateDevice from homeassistant.components.climate.const import ( SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN -from homeassistant.components.tesla import TeslaDevice from homeassistant.const import ( ATTR_TEMPERATURE, STATE_OFF, STATE_ON, TEMP_CELSIUS, TEMP_FAHRENHEIT) +from . import DOMAIN as TESLA_DOMAIN, TeslaDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['tesla'] diff --git a/homeassistant/components/tesla/device_tracker.py b/homeassistant/components/tesla/device_tracker.py index 0aeab5b1c..5a7693d83 100644 --- a/homeassistant/components/tesla/device_tracker.py +++ b/homeassistant/components/tesla/device_tracker.py @@ -1,10 +1,11 @@ """Support for tracking Tesla cars.""" import logging -from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN from homeassistant.helpers.event import track_utc_time_change from homeassistant.util import slugify +from . import DOMAIN as TESLA_DOMAIN + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['tesla'] diff --git a/homeassistant/components/tesla/lock.py b/homeassistant/components/tesla/lock.py index 34d660ac8..ade394496 100644 --- a/homeassistant/components/tesla/lock.py +++ b/homeassistant/components/tesla/lock.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.lock import ENTITY_ID_FORMAT, LockDevice -from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN -from homeassistant.components.tesla import TeslaDevice from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED +from . import DOMAIN as TESLA_DOMAIN, TeslaDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['tesla'] diff --git a/homeassistant/components/tesla/sensor.py b/homeassistant/components/tesla/sensor.py index 1d4505ed9..99705d3f7 100644 --- a/homeassistant/components/tesla/sensor.py +++ b/homeassistant/components/tesla/sensor.py @@ -3,12 +3,12 @@ from datetime import timedelta import logging from homeassistant.components.sensor import ENTITY_ID_FORMAT -from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN -from homeassistant.components.tesla import TeslaDevice from homeassistant.const import ( - TEMP_CELSIUS, TEMP_FAHRENHEIT, LENGTH_KILOMETERS, LENGTH_MILES) + LENGTH_KILOMETERS, LENGTH_MILES, TEMP_CELSIUS, TEMP_FAHRENHEIT) from homeassistant.helpers.entity import Entity +from . import DOMAIN as TESLA_DOMAIN, TeslaDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['tesla'] diff --git a/homeassistant/components/tesla/switch.py b/homeassistant/components/tesla/switch.py index a1787e999..e00164ff1 100644 --- a/homeassistant/components/tesla/switch.py +++ b/homeassistant/components/tesla/switch.py @@ -2,10 +2,10 @@ import logging from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchDevice -from homeassistant.components.tesla import DOMAIN as TESLA_DOMAIN -from homeassistant.components.tesla import TeslaDevice from homeassistant.const import STATE_OFF, STATE_ON +from . import DOMAIN as TESLA_DOMAIN, TeslaDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['tesla'] diff --git a/homeassistant/components/thethingsnetwork/sensor.py b/homeassistant/components/thethingsnetwork/sensor.py index 05da90bf7..d59b42972 100644 --- a/homeassistant/components/thethingsnetwork/sensor.py +++ b/homeassistant/components/thethingsnetwork/sensor.py @@ -8,13 +8,13 @@ import async_timeout import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.components.thethingsnetwork import ( - DATA_TTN, TTN_APP_ID, TTN_ACCESS_KEY, TTN_DATA_STORAGE_URL) from homeassistant.const import CONTENT_TYPE_JSON from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import DATA_TTN, TTN_ACCESS_KEY, TTN_APP_ID, TTN_DATA_STORAGE_URL + _LOGGER = logging.getLogger(__name__) ATTR_DEVICE_ID = 'device_id' diff --git a/homeassistant/components/tibber/notify.py b/homeassistant/components/tibber/notify.py index 6ae22c342..604fadb87 100644 --- a/homeassistant/components/tibber/notify.py +++ b/homeassistant/components/tibber/notify.py @@ -4,7 +4,8 @@ import logging from homeassistant.components.notify import ( ATTR_TITLE, ATTR_TITLE_DEFAULT, BaseNotificationService) -from homeassistant.components.tibber import DOMAIN as TIBBER_DOMAIN + +from . import DOMAIN as TIBBER_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tibber/sensor.py b/homeassistant/components/tibber/sensor.py index fb224a254..9f3e9cdcc 100644 --- a/homeassistant/components/tibber/sensor.py +++ b/homeassistant/components/tibber/sensor.py @@ -1,16 +1,15 @@ """Support for Tibber sensors.""" import asyncio - +from datetime import timedelta import logging -from datetime import timedelta import aiohttp -from homeassistant.components.tibber import DOMAIN as TIBBER_DOMAIN from homeassistant.exceptions import PlatformNotReady from homeassistant.helpers.entity import Entity -from homeassistant.util import dt as dt_util -from homeassistant.util import Throttle +from homeassistant.util import Throttle, dt as dt_util + +from . import DOMAIN as TIBBER_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tplink/light.py b/homeassistant/components/tplink/light.py index de1a943c3..0ba1dfaa3 100644 --- a/homeassistant/components/tplink/light.py +++ b/homeassistant/components/tplink/light.py @@ -8,15 +8,14 @@ import logging import time from homeassistant.components.light import ( - Light, ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, - SUPPORT_COLOR_TEMP, SUPPORT_COLOR) -from homeassistant.util.color import \ - color_temperature_mired_to_kelvin as mired_to_kelvin -from homeassistant.util.color import ( - color_temperature_kelvin_to_mired as kelvin_to_mired) + ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, + SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) import homeassistant.helpers.device_registry as dr -from homeassistant.components.tplink import (DOMAIN as TPLINK_DOMAIN, - CONF_LIGHT) +from homeassistant.util.color import ( + color_temperature_kelvin_to_mired as kelvin_to_mired, + color_temperature_mired_to_kelvin as mired_to_kelvin) + +from . import CONF_LIGHT, DOMAIN as TPLINK_DOMAIN DEPENDENCIES = ['tplink'] diff --git a/homeassistant/components/tplink/switch.py b/homeassistant/components/tplink/switch.py index 65b884169..a75945e99 100644 --- a/homeassistant/components/tplink/switch.py +++ b/homeassistant/components/tplink/switch.py @@ -8,12 +8,12 @@ import logging import time from homeassistant.components.switch import ( - SwitchDevice, ATTR_CURRENT_POWER_W, ATTR_TODAY_ENERGY_KWH) -from homeassistant.components.tplink import (DOMAIN as TPLINK_DOMAIN, - CONF_SWITCH) + ATTR_CURRENT_POWER_W, ATTR_TODAY_ENERGY_KWH, SwitchDevice) from homeassistant.const import ATTR_VOLTAGE import homeassistant.helpers.device_registry as dr +from . import CONF_SWITCH, DOMAIN as TPLINK_DOMAIN + DEPENDENCIES = ['tplink'] PARALLEL_UPDATES = 0 diff --git a/homeassistant/components/tradfri/light.py b/homeassistant/components/tradfri/light.py index e5e27ecbe..38ce428b5 100644 --- a/homeassistant/components/tradfri/light.py +++ b/homeassistant/components/tradfri/light.py @@ -1,19 +1,16 @@ """Support for IKEA Tradfri lights.""" import logging -from homeassistant.core import callback from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ATTR_TRANSITION, - SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION, SUPPORT_COLOR_TEMP, - SUPPORT_COLOR, Light) -from homeassistant.components.light import \ - PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA -from homeassistant.components.tradfri import ( - KEY_GATEWAY, KEY_API, DOMAIN as TRADFRI_DOMAIN) -from homeassistant.components.tradfri.const import ( - CONF_IMPORT_GROUPS, CONF_GATEWAY_ID) + PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, + SUPPORT_COLOR, SUPPORT_COLOR_TEMP, SUPPORT_TRANSITION, Light) +from homeassistant.core import callback import homeassistant.util.color as color_util +from . import DOMAIN as TRADFRI_DOMAIN, KEY_API, KEY_GATEWAY +from .const import CONF_GATEWAY_ID, CONF_IMPORT_GROUPS + _LOGGER = logging.getLogger(__name__) ATTR_DIMMER = 'dimmer' diff --git a/homeassistant/components/tradfri/sensor.py b/homeassistant/components/tradfri/sensor.py index 97c7dc962..acc84a935 100644 --- a/homeassistant/components/tradfri/sensor.py +++ b/homeassistant/components/tradfri/sensor.py @@ -1,12 +1,12 @@ """Support for IKEA Tradfri sensors.""" +from datetime import timedelta import logging -from datetime import timedelta - from homeassistant.core import callback -from homeassistant.components.tradfri import KEY_GATEWAY, KEY_API from homeassistant.helpers.entity import Entity +from . import KEY_API, KEY_GATEWAY + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['tradfri'] diff --git a/homeassistant/components/tradfri/switch.py b/homeassistant/components/tradfri/switch.py index 23e6cb20c..ef9a9537c 100644 --- a/homeassistant/components/tradfri/switch.py +++ b/homeassistant/components/tradfri/switch.py @@ -1,12 +1,11 @@ """Support for IKEA Tradfri switches.""" import logging -from homeassistant.core import callback from homeassistant.components.switch import SwitchDevice -from homeassistant.components.tradfri import ( - KEY_GATEWAY, KEY_API, DOMAIN as TRADFRI_DOMAIN) -from homeassistant.components.tradfri.const import ( - CONF_GATEWAY_ID) +from homeassistant.core import callback + +from . import DOMAIN as TRADFRI_DOMAIN, KEY_API, KEY_GATEWAY +from .const import CONF_GATEWAY_ID _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/transmission/sensor.py b/homeassistant/components/transmission/sensor.py index 061ed2c0c..dfd4c1950 100644 --- a/homeassistant/components/transmission/sensor.py +++ b/homeassistant/components/transmission/sensor.py @@ -1,15 +1,14 @@ """Support for monitoring the Transmission BitTorrent client API.""" from datetime import timedelta - import logging -from homeassistant.components.transmission import ( - DATA_TRANSMISSION, SENSOR_TYPES, DATA_UPDATED) from homeassistant.const import STATE_IDLE from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity +from . import DATA_TRANSMISSION, DATA_UPDATED, SENSOR_TYPES + DEPENDENCIES = ['transmission'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/transmission/switch.py b/homeassistant/components/transmission/switch.py index 373397edd..854a2e727 100644 --- a/homeassistant/components/transmission/switch.py +++ b/homeassistant/components/transmission/switch.py @@ -1,14 +1,13 @@ """Support for setting the Transmission BitTorrent client Turtle Mode.""" import logging -from homeassistant.components.transmission import ( - DATA_TRANSMISSION, DATA_UPDATED) -from homeassistant.const import ( - STATE_OFF, STATE_ON) +from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import ToggleEntity +from . import DATA_TRANSMISSION, DATA_UPDATED + DEPENDENCIES = ['transmission'] _LOGGING = logging.getLogger(__name__) diff --git a/homeassistant/components/tts/amazon_polly.py b/homeassistant/components/tts/amazon_polly.py index 0102a1fec..12383df11 100644 --- a/homeassistant/components/tts/amazon_polly.py +++ b/homeassistant/components/tts/amazon_polly.py @@ -8,9 +8,10 @@ import logging import voluptuous as vol -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA import homeassistant.helpers.config_validation as cv +from . import PLATFORM_SCHEMA, Provider + REQUIREMENTS = ['boto3==1.9.16'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tts/baidu.py b/homeassistant/components/tts/baidu.py index 609f38454..e7a1f368f 100644 --- a/homeassistant/components/tts/baidu.py +++ b/homeassistant/components/tts/baidu.py @@ -6,12 +6,14 @@ https://home-assistant.io/components/tts.baidu/ """ import logging + import voluptuous as vol -from homeassistant.components.tts import Provider, CONF_LANG, PLATFORM_SCHEMA from homeassistant.const import CONF_API_KEY import homeassistant.helpers.config_validation as cv +from . import CONF_LANG, PLATFORM_SCHEMA, Provider + REQUIREMENTS = ["baidu-aip==1.6.6"] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tts/demo.py b/homeassistant/components/tts/demo.py index ba854fc2f..6784e7cea 100644 --- a/homeassistant/components/tts/demo.py +++ b/homeassistant/components/tts/demo.py @@ -8,7 +8,7 @@ import os import voluptuous as vol -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA, CONF_LANG +from . import CONF_LANG, PLATFORM_SCHEMA, Provider SUPPORT_LANGUAGES = [ 'en', 'de' diff --git a/homeassistant/components/tts/marytts.py b/homeassistant/components/tts/marytts.py index 61f01a9b2..971d3fb57 100644 --- a/homeassistant/components/tts/marytts.py +++ b/homeassistant/components/tts/marytts.py @@ -13,10 +13,11 @@ import async_timeout import voluptuous as vol from homeassistant.const import CONF_HOST, CONF_PORT -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA, CONF_LANG from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv +from . import CONF_LANG, PLATFORM_SCHEMA, Provider + _LOGGER = logging.getLogger(__name__) SUPPORT_LANGUAGES = [ diff --git a/homeassistant/components/tts/microsoft.py b/homeassistant/components/tts/microsoft.py index 3cce7c1a7..ab9fb576c 100644 --- a/homeassistant/components/tts/microsoft.py +++ b/homeassistant/components/tts/microsoft.py @@ -4,15 +4,16 @@ Support for the Microsoft Cognitive Services text-to-speech service. For more details about this component, please refer to the documentation at https://home-assistant.io/components/tts.microsoft/ """ -import logging from http.client import HTTPException +import logging import voluptuous as vol -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA, CONF_LANG -from homeassistant.const import CONF_TYPE, CONF_API_KEY +from homeassistant.const import CONF_API_KEY, CONF_TYPE import homeassistant.helpers.config_validation as cv +from . import CONF_LANG, PLATFORM_SCHEMA, Provider + CONF_GENDER = 'gender' CONF_OUTPUT = 'output' CONF_RATE = 'rate' diff --git a/homeassistant/components/tts/picotts.py b/homeassistant/components/tts/picotts.py index 59c698303..99d3b5e97 100644 --- a/homeassistant/components/tts/picotts.py +++ b/homeassistant/components/tts/picotts.py @@ -4,14 +4,15 @@ Support for the Pico TTS speech service. For more details about this component, please refer to the documentation at https://home-assistant.io/components/tts.picotts/ """ +import logging import os -import tempfile import shutil import subprocess -import logging +import tempfile + import voluptuous as vol -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA, CONF_LANG +from . import CONF_LANG, PLATFORM_SCHEMA, Provider _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tts/voicerss.py b/homeassistant/components/tts/voicerss.py index 22eba69e5..3676dff3b 100644 --- a/homeassistant/components/tts/voicerss.py +++ b/homeassistant/components/tts/voicerss.py @@ -12,10 +12,11 @@ import async_timeout import voluptuous as vol from homeassistant.const import CONF_API_KEY -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA, CONF_LANG from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv +from . import CONF_LANG, PLATFORM_SCHEMA, Provider + _LOGGER = logging.getLogger(__name__) VOICERSS_API_URL = "https://api.voicerss.org/" diff --git a/homeassistant/components/tts/yandextts.py b/homeassistant/components/tts/yandextts.py index 112e78413..aecba2925 100644 --- a/homeassistant/components/tts/yandextts.py +++ b/homeassistant/components/tts/yandextts.py @@ -12,10 +12,10 @@ import async_timeout import voluptuous as vol from homeassistant.const import CONF_API_KEY -from homeassistant.components.tts import Provider, PLATFORM_SCHEMA, CONF_LANG from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv +from . import CONF_LANG, PLATFORM_SCHEMA, Provider _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tuya/climate.py b/homeassistant/components/tuya/climate.py index 06714760a..b7a10dad8 100644 --- a/homeassistant/components/tuya/climate.py +++ b/homeassistant/components/tuya/climate.py @@ -1,15 +1,15 @@ """Support for the Tuya climate devices.""" -from homeassistant.components.climate import ClimateDevice, ENTITY_ID_FORMAT +from homeassistant.components.climate import ENTITY_ID_FORMAT, ClimateDevice from homeassistant.components.climate.const import ( - STATE_AUTO, STATE_COOL, STATE_ECO, - STATE_FAN_ONLY, STATE_HEAT, SUPPORT_FAN_MODE, SUPPORT_ON_OFF, - SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.fan import SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH -from homeassistant.components.tuya import DATA_TUYA, TuyaDevice - + STATE_AUTO, STATE_COOL, STATE_ECO, STATE_FAN_ONLY, STATE_HEAT, + SUPPORT_FAN_MODE, SUPPORT_ON_OFF, SUPPORT_OPERATION_MODE, + SUPPORT_TARGET_TEMPERATURE) +from homeassistant.components.fan import SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM from homeassistant.const import ( ATTR_TEMPERATURE, PRECISION_WHOLE, TEMP_CELSIUS, TEMP_FAHRENHEIT) +from . import DATA_TUYA, TuyaDevice + DEPENDENCIES = ['tuya'] DEVICE_TYPE = 'climate' diff --git a/homeassistant/components/tuya/cover.py b/homeassistant/components/tuya/cover.py index ac2309cbf..274f4d938 100644 --- a/homeassistant/components/tuya/cover.py +++ b/homeassistant/components/tuya/cover.py @@ -1,7 +1,8 @@ """Support for Tuya covers.""" from homeassistant.components.cover import ( - CoverDevice, ENTITY_ID_FORMAT, SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_STOP) -from homeassistant.components.tuya import DATA_TUYA, TuyaDevice + ENTITY_ID_FORMAT, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_STOP, CoverDevice) + +from . import DATA_TUYA, TuyaDevice DEPENDENCIES = ['tuya'] diff --git a/homeassistant/components/tuya/fan.py b/homeassistant/components/tuya/fan.py index b6e2cb695..259417869 100644 --- a/homeassistant/components/tuya/fan.py +++ b/homeassistant/components/tuya/fan.py @@ -1,9 +1,10 @@ """Support for Tuya fans.""" from homeassistant.components.fan import ( - ENTITY_ID_FORMAT, FanEntity, SUPPORT_OSCILLATE, SUPPORT_SET_SPEED) -from homeassistant.components.tuya import DATA_TUYA, TuyaDevice + ENTITY_ID_FORMAT, SUPPORT_OSCILLATE, SUPPORT_SET_SPEED, FanEntity) from homeassistant.const import STATE_OFF +from . import DATA_TUYA, TuyaDevice + DEPENDENCIES = ['tuya'] diff --git a/homeassistant/components/tuya/light.py b/homeassistant/components/tuya/light.py index 1cf2f8118..17f9b43dc 100644 --- a/homeassistant/components/tuya/light.py +++ b/homeassistant/components/tuya/light.py @@ -1,11 +1,11 @@ """Support for the Tuya lights.""" from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ENTITY_ID_FORMAT, - SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP, SUPPORT_COLOR, Light) - -from homeassistant.components.tuya import DATA_TUYA, TuyaDevice + SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) from homeassistant.util import color as colorutil +from . import DATA_TUYA, TuyaDevice + DEPENDENCIES = ['tuya'] diff --git a/homeassistant/components/tuya/scene.py b/homeassistant/components/tuya/scene.py index 33d207d85..24383dca6 100644 --- a/homeassistant/components/tuya/scene.py +++ b/homeassistant/components/tuya/scene.py @@ -1,6 +1,7 @@ """Support for the Tuya scenes.""" -from homeassistant.components.scene import Scene, DOMAIN -from homeassistant.components.tuya import DATA_TUYA, TuyaDevice +from homeassistant.components.scene import DOMAIN, Scene + +from . import DATA_TUYA, TuyaDevice DEPENDENCIES = ['tuya'] diff --git a/homeassistant/components/tuya/switch.py b/homeassistant/components/tuya/switch.py index 1e8fab2cc..c2e32eedc 100644 --- a/homeassistant/components/tuya/switch.py +++ b/homeassistant/components/tuya/switch.py @@ -1,6 +1,7 @@ """Support for Tuya switches.""" from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchDevice -from homeassistant.components.tuya import DATA_TUYA, TuyaDevice + +from . import DATA_TUYA, TuyaDevice DEPENDENCIES = ['tuya'] diff --git a/homeassistant/components/unifi/const.py b/homeassistant/components/unifi/const.py index 8fe90823c..fdeb15ee4 100644 --- a/homeassistant/components/unifi/const.py +++ b/homeassistant/components/unifi/const.py @@ -1,7 +1,7 @@ """Constants for the UniFi component.""" import logging -LOGGER = logging.getLogger('homeassistant.components.unifi') +LOGGER = logging.getLogger('.') DOMAIN = 'unifi' CONTROLLER_ID = '{host}-{site}' diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py index 425b9878f..e90da2dbc 100644 --- a/homeassistant/components/unifi/switch.py +++ b/homeassistant/components/unifi/switch.py @@ -1,19 +1,18 @@ """Support for devices connected to UniFi POE.""" import asyncio -import logging - from datetime import timedelta +import logging import async_timeout from homeassistant.components import unifi from homeassistant.components.switch import SwitchDevice -from homeassistant.components.unifi.const import ( - CONF_CONTROLLER, CONF_SITE_ID, CONTROLLER_ID, DOMAIN) from homeassistant.const import CONF_HOST from homeassistant.core import callback from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC +from .const import CONF_CONTROLLER, CONF_SITE_ID, CONTROLLER_ID, DOMAIN + DEPENDENCIES = [DOMAIN] SCAN_INTERVAL = timedelta(seconds=15) diff --git a/homeassistant/components/upcloud/binary_sensor.py b/homeassistant/components/upcloud/binary_sensor.py index 3fd54b349..a0c3c9f34 100644 --- a/homeassistant/components/upcloud/binary_sensor.py +++ b/homeassistant/components/upcloud/binary_sensor.py @@ -3,11 +3,11 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) -from homeassistant.components.upcloud import ( - UpCloudServerEntity, CONF_SERVERS, DATA_UPCLOUD) + PLATFORM_SCHEMA, BinarySensorDevice) +import homeassistant.helpers.config_validation as cv + +from . import CONF_SERVERS, DATA_UPCLOUD, UpCloudServerEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/upcloud/switch.py b/homeassistant/components/upcloud/switch.py index 0b44d787f..7e84adccf 100644 --- a/homeassistant/components/upcloud/switch.py +++ b/homeassistant/components/upcloud/switch.py @@ -3,11 +3,11 @@ import logging import voluptuous as vol +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import STATE_OFF import homeassistant.helpers.config_validation as cv -from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA) -from homeassistant.components.upcloud import ( - UpCloudServerEntity, CONF_SERVERS, DATA_UPCLOUD) + +from . import CONF_SERVERS, DATA_UPCLOUD, UpCloudServerEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/upnp/const.py b/homeassistant/components/upnp/const.py index 04932488a..9d2957660 100644 --- a/homeassistant/components/upnp/const.py +++ b/homeassistant/components/upnp/const.py @@ -1,12 +1,11 @@ """Constants for the IGD component.""" import logging - CONF_ENABLE_PORT_MAPPING = 'port_mapping' CONF_ENABLE_SENSORS = 'sensors' CONF_HASS = 'hass' CONF_LOCAL_IP = 'local_ip' CONF_PORTS = 'ports' DOMAIN = 'upnp' -LOGGER = logging.getLogger('homeassistant.components.upnp') +LOGGER = logging.getLogger('.') SIGNAL_REMOVE_SENSOR = 'upnp_remove_sensor' diff --git a/homeassistant/components/upnp/sensor.py b/homeassistant/components/upnp/sensor.py index 8eccf8834..5f544e1a1 100644 --- a/homeassistant/components/upnp/sensor.py +++ b/homeassistant/components/upnp/sensor.py @@ -10,9 +10,8 @@ import logging from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import Entity -from homeassistant.components.upnp.const import DOMAIN as DOMAIN_UPNP -from homeassistant.components.upnp.const import SIGNAL_REMOVE_SENSOR +from .const import DOMAIN as DOMAIN_UPNP, SIGNAL_REMOVE_SENSOR _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/usps/camera.py b/homeassistant/components/usps/camera.py index d4769102d..5b5eaca4c 100644 --- a/homeassistant/components/usps/camera.py +++ b/homeassistant/components/usps/camera.py @@ -3,7 +3,8 @@ from datetime import timedelta import logging from homeassistant.components.camera import Camera -from homeassistant.components.usps import DATA_USPS + +from . import DATA_USPS _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/usps/sensor.py b/homeassistant/components/usps/sensor.py index 160371586..3e5fea5c4 100644 --- a/homeassistant/components/usps/sensor.py +++ b/homeassistant/components/usps/sensor.py @@ -2,12 +2,13 @@ from collections import defaultdict import logging -from homeassistant.components.usps import DATA_USPS from homeassistant.const import ATTR_ATTRIBUTION, ATTR_DATE from homeassistant.helpers.entity import Entity from homeassistant.util import slugify from homeassistant.util.dt import now +from . import DATA_USPS + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['usps'] diff --git a/homeassistant/components/vacuum/demo.py b/homeassistant/components/vacuum/demo.py index 12507683f..2a19337c0 100644 --- a/homeassistant/components/vacuum/demo.py +++ b/homeassistant/components/vacuum/demo.py @@ -6,13 +6,12 @@ https://home-assistant.io/components/demo/ """ import logging -from homeassistant.components.vacuum import ( - ATTR_CLEANED_AREA, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, - SUPPORT_FAN_SPEED, SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, - SUPPORT_SEND_COMMAND, SUPPORT_STATUS, SUPPORT_STOP, SUPPORT_TURN_OFF, - SUPPORT_TURN_ON, SUPPORT_STATE, SUPPORT_START, STATE_CLEANING, - STATE_DOCKED, STATE_IDLE, STATE_PAUSED, STATE_RETURNING, VacuumDevice, - StateVacuumDevice) +from . import ( + ATTR_CLEANED_AREA, STATE_CLEANING, STATE_DOCKED, STATE_IDLE, STATE_PAUSED, + STATE_RETURNING, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED, + SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, SUPPORT_SEND_COMMAND, + SUPPORT_START, SUPPORT_STATE, SUPPORT_STATUS, SUPPORT_STOP, + SUPPORT_TURN_OFF, SUPPORT_TURN_ON, StateVacuumDevice, VacuumDevice) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/velbus/binary_sensor.py b/homeassistant/components/velbus/binary_sensor.py index 43ffa232b..cbe1350bd 100644 --- a/homeassistant/components/velbus/binary_sensor.py +++ b/homeassistant/components/velbus/binary_sensor.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.velbus import ( - DOMAIN as VELBUS_DOMAIN, VelbusEntity) + +from . import DOMAIN as VELBUS_DOMAIN, VelbusEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/velbus/climate.py b/homeassistant/components/velbus/climate.py index 1f45408a6..470524bb6 100644 --- a/homeassistant/components/velbus/climate.py +++ b/homeassistant/components/velbus/climate.py @@ -4,10 +4,9 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( STATE_HEAT, SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.velbus import ( - DOMAIN as VELBUS_DOMAIN, VelbusEntity) -from homeassistant.const import ( - TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE) +from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT + +from . import DOMAIN as VELBUS_DOMAIN, VelbusEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/velbus/cover.py b/homeassistant/components/velbus/cover.py index 72a5a7af7..b176ab76c 100644 --- a/homeassistant/components/velbus/cover.py +++ b/homeassistant/components/velbus/cover.py @@ -5,12 +5,12 @@ import time import voluptuous as vol from homeassistant.components.cover import ( - CoverDevice, PLATFORM_SCHEMA, SUPPORT_OPEN, SUPPORT_CLOSE, - SUPPORT_STOP) -from homeassistant.components.velbus import DOMAIN -from homeassistant.const import (CONF_COVERS, CONF_NAME) + PLATFORM_SCHEMA, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_STOP, CoverDevice) +from homeassistant.const import CONF_COVERS, CONF_NAME import homeassistant.helpers.config_validation as cv +from . import DOMAIN + _LOGGER = logging.getLogger(__name__) COVER_SCHEMA = vol.Schema({ diff --git a/homeassistant/components/velbus/sensor.py b/homeassistant/components/velbus/sensor.py index 10ad89ab8..ad78a795a 100644 --- a/homeassistant/components/velbus/sensor.py +++ b/homeassistant/components/velbus/sensor.py @@ -1,8 +1,7 @@ """Support for Velbus sensors.""" import logging -from homeassistant.components.velbus import ( - DOMAIN as VELBUS_DOMAIN, VelbusEntity) +from . import DOMAIN as VELBUS_DOMAIN, VelbusEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/velbus/switch.py b/homeassistant/components/velbus/switch.py index 7104bb075..b5ef89ca4 100644 --- a/homeassistant/components/velbus/switch.py +++ b/homeassistant/components/velbus/switch.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.switch import SwitchDevice -from homeassistant.components.velbus import ( - DOMAIN as VELBUS_DOMAIN, VelbusEntity) + +from . import DOMAIN as VELBUS_DOMAIN, VelbusEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/velux/cover.py b/homeassistant/components/velux/cover.py index 6abaa42bb..1893909b7 100644 --- a/homeassistant/components/velux/cover.py +++ b/homeassistant/components/velux/cover.py @@ -2,9 +2,10 @@ from homeassistant.components.cover import ( ATTR_POSITION, SUPPORT_CLOSE, SUPPORT_OPEN, SUPPORT_SET_POSITION, SUPPORT_STOP, CoverDevice) -from homeassistant.components.velux import DATA_VELUX from homeassistant.core import callback +from . import DATA_VELUX + DEPENDENCIES = ['velux'] diff --git a/homeassistant/components/velux/scene.py b/homeassistant/components/velux/scene.py index b0716dc2c..614d3f349 100644 --- a/homeassistant/components/velux/scene.py +++ b/homeassistant/components/velux/scene.py @@ -1,6 +1,7 @@ """Support for VELUX scenes.""" from homeassistant.components.scene import Scene -from homeassistant.components.velux import _LOGGER, DATA_VELUX + +from . import _LOGGER, DATA_VELUX DEPENDENCIES = ['velux'] diff --git a/homeassistant/components/vera/binary_sensor.py b/homeassistant/components/vera/binary_sensor.py index 837422dbc..c81fa3193 100644 --- a/homeassistant/components/vera/binary_sensor.py +++ b/homeassistant/components/vera/binary_sensor.py @@ -2,9 +2,9 @@ import logging from homeassistant.components.binary_sensor import ( - BinarySensorDevice, ENTITY_ID_FORMAT) -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) + ENTITY_ID_FORMAT, BinarySensorDevice) + +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice DEPENDENCIES = ['vera'] diff --git a/homeassistant/components/vera/climate.py b/homeassistant/components/vera/climate.py index 9c812da92..f8ff9c21b 100644 --- a/homeassistant/components/vera/climate.py +++ b/homeassistant/components/vera/climate.py @@ -1,21 +1,15 @@ """Support for Vera thermostats.""" import logging -from homeassistant.util import convert -from homeassistant.components.climate import ClimateDevice, ENTITY_ID_FORMAT +from homeassistant.components.climate import ENTITY_ID_FORMAT, ClimateDevice from homeassistant.components.climate.const import ( - STATE_AUTO, STATE_COOL, - STATE_HEAT, SUPPORT_TARGET_TEMPERATURE, - SUPPORT_OPERATION_MODE, SUPPORT_FAN_MODE) + STATE_AUTO, STATE_COOL, STATE_HEAT, SUPPORT_FAN_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE) from homeassistant.const import ( - STATE_ON, - STATE_OFF, - TEMP_FAHRENHEIT, - TEMP_CELSIUS, - ATTR_TEMPERATURE) + ATTR_TEMPERATURE, STATE_OFF, STATE_ON, TEMP_CELSIUS, TEMP_FAHRENHEIT) +from homeassistant.util import convert -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice DEPENDENCIES = ['vera'] diff --git a/homeassistant/components/vera/cover.py b/homeassistant/components/vera/cover.py index 1168cca84..4cf2aac3b 100644 --- a/homeassistant/components/vera/cover.py +++ b/homeassistant/components/vera/cover.py @@ -1,10 +1,10 @@ """Support for Vera cover - curtains, rollershutters etc.""" import logging -from homeassistant.components.cover import CoverDevice, ENTITY_ID_FORMAT, \ - ATTR_POSITION -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) +from homeassistant.components.cover import ( + ATTR_POSITION, ENTITY_ID_FORMAT, CoverDevice) + +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice DEPENDENCIES = ['vera'] diff --git a/homeassistant/components/vera/light.py b/homeassistant/components/vera/light.py index 93e54b915..e4e315bb5 100644 --- a/homeassistant/components/vera/light.py +++ b/homeassistant/components/vera/light.py @@ -2,12 +2,12 @@ import logging from homeassistant.components.light import ( - ATTR_BRIGHTNESS, ATTR_HS_COLOR, ENTITY_ID_FORMAT, - SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light) -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) + ATTR_BRIGHTNESS, ATTR_HS_COLOR, ENTITY_ID_FORMAT, SUPPORT_BRIGHTNESS, + SUPPORT_COLOR, Light) import homeassistant.util.color as color_util +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['vera'] diff --git a/homeassistant/components/vera/lock.py b/homeassistant/components/vera/lock.py index 61d5f0baf..5ace07b87 100644 --- a/homeassistant/components/vera/lock.py +++ b/homeassistant/components/vera/lock.py @@ -2,9 +2,9 @@ import logging from homeassistant.components.lock import ENTITY_ID_FORMAT, LockDevice -from homeassistant.const import (STATE_LOCKED, STATE_UNLOCKED) -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) +from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED + +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/vera/scene.py b/homeassistant/components/vera/scene.py index 0960512f6..5000f9bc5 100644 --- a/homeassistant/components/vera/scene.py +++ b/homeassistant/components/vera/scene.py @@ -1,10 +1,10 @@ """Support for Vera scenes.""" import logging -from homeassistant.util import slugify from homeassistant.components.scene import Scene -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_SCENES, VERA_ID_FORMAT) +from homeassistant.util import slugify + +from . import VERA_CONTROLLER, VERA_ID_FORMAT, VERA_SCENES _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/vera/sensor.py b/homeassistant/components/vera/sensor.py index 8b68cc919..3c026046b 100644 --- a/homeassistant/components/vera/sensor.py +++ b/homeassistant/components/vera/sensor.py @@ -1,14 +1,13 @@ """Support for Vera sensors.""" -import logging from datetime import timedelta +import logging -from homeassistant.const import ( - TEMP_CELSIUS, TEMP_FAHRENHEIT) -from homeassistant.helpers.entity import Entity from homeassistant.components.sensor import ENTITY_ID_FORMAT +from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT +from homeassistant.helpers.entity import Entity from homeassistant.util import convert -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) + +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/vera/switch.py b/homeassistant/components/vera/switch.py index 2f4d18e34..f422e49bf 100644 --- a/homeassistant/components/vera/switch.py +++ b/homeassistant/components/vera/switch.py @@ -1,10 +1,10 @@ """Support for Vera switches.""" import logging -from homeassistant.util import convert from homeassistant.components.switch import ENTITY_ID_FORMAT, SwitchDevice -from homeassistant.components.vera import ( - VERA_CONTROLLER, VERA_DEVICES, VeraDevice) +from homeassistant.util import convert + +from . import VERA_CONTROLLER, VERA_DEVICES, VeraDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/verisure/alarm_control_panel.py b/homeassistant/components/verisure/alarm_control_panel.py index adcdcd668..dc73be056 100644 --- a/homeassistant/components/verisure/alarm_control_panel.py +++ b/homeassistant/components/verisure/alarm_control_panel.py @@ -3,11 +3,11 @@ import logging from time import sleep import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.verisure import CONF_ALARM, CONF_CODE_DIGITS -from homeassistant.components.verisure import HUB as hub from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) +from . import CONF_ALARM, CONF_CODE_DIGITS, HUB as hub + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/verisure/binary_sensor.py b/homeassistant/components/verisure/binary_sensor.py index 4c9e79724..1c1e0ee15 100644 --- a/homeassistant/components/verisure/binary_sensor.py +++ b/homeassistant/components/verisure/binary_sensor.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.verisure import CONF_DOOR_WINDOW -from homeassistant.components.verisure import HUB as hub + +from . import CONF_DOOR_WINDOW, HUB as hub _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/verisure/camera.py b/homeassistant/components/verisure/camera.py index 7112e535a..fad3d2bef 100644 --- a/homeassistant/components/verisure/camera.py +++ b/homeassistant/components/verisure/camera.py @@ -5,8 +5,8 @@ import os from homeassistant.components.camera import Camera from homeassistant.const import EVENT_HOMEASSISTANT_STOP -from homeassistant.components.verisure import HUB as hub -from homeassistant.components.verisure import CONF_SMARTCAM + +from . import CONF_SMARTCAM, HUB as hub _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/verisure/lock.py b/homeassistant/components/verisure/lock.py index cdd230ea7..2010504c9 100644 --- a/homeassistant/components/verisure/lock.py +++ b/homeassistant/components/verisure/lock.py @@ -1,13 +1,11 @@ """Support for Verisure locks.""" import logging -from time import sleep -from time import time -from homeassistant.components.verisure import HUB as hub -from homeassistant.components.verisure import ( - CONF_LOCKS, CONF_DEFAULT_LOCK_CODE, CONF_CODE_DIGITS) +from time import sleep, time + from homeassistant.components.lock import LockDevice -from homeassistant.const import ( - ATTR_CODE, STATE_LOCKED, STATE_UNLOCKED) +from homeassistant.const import ATTR_CODE, STATE_LOCKED, STATE_UNLOCKED + +from . import CONF_CODE_DIGITS, CONF_DEFAULT_LOCK_CODE, CONF_LOCKS, HUB as hub _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/verisure/sensor.py b/homeassistant/components/verisure/sensor.py index 13706d840..cf5205a61 100644 --- a/homeassistant/components/verisure/sensor.py +++ b/homeassistant/components/verisure/sensor.py @@ -1,12 +1,11 @@ """Support for Verisure sensors.""" import logging -from homeassistant.components.verisure import HUB as hub -from homeassistant.components.verisure import ( - CONF_THERMOMETERS, CONF_HYDROMETERS, CONF_MOUSE) from homeassistant.const import TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import CONF_HYDROMETERS, CONF_MOUSE, CONF_THERMOMETERS, HUB as hub + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/verisure/switch.py b/homeassistant/components/verisure/switch.py index a418eec6b..eb69d4c02 100644 --- a/homeassistant/components/verisure/switch.py +++ b/homeassistant/components/verisure/switch.py @@ -2,10 +2,10 @@ import logging from time import time -from homeassistant.components.verisure import HUB as hub -from homeassistant.components.verisure import CONF_SMARTPLUGS from homeassistant.components.switch import SwitchDevice +from . import CONF_SMARTPLUGS, HUB as hub + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/volvooncall/binary_sensor.py b/homeassistant/components/volvooncall/binary_sensor.py index 7158e4df6..4b4f4ff77 100644 --- a/homeassistant/components/volvooncall/binary_sensor.py +++ b/homeassistant/components/volvooncall/binary_sensor.py @@ -1,9 +1,10 @@ """Support for VOC.""" import logging -from homeassistant.components.volvooncall import VolvoEntity, DATA_KEY from homeassistant.components.binary_sensor import ( - BinarySensorDevice, DEVICE_CLASSES) + DEVICE_CLASSES, BinarySensorDevice) + +from . import DATA_KEY, VolvoEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/volvooncall/device_tracker.py b/homeassistant/components/volvooncall/device_tracker.py index d4838c015..6c7e0914f 100644 --- a/homeassistant/components/volvooncall/device_tracker.py +++ b/homeassistant/components/volvooncall/device_tracker.py @@ -1,10 +1,11 @@ """Support for tracking a Volvo.""" import logging -from homeassistant.util import slugify -from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.components.device_tracker import SOURCE_TYPE_GPS -from homeassistant.components.volvooncall import DATA_KEY, SIGNAL_STATE_UPDATED +from homeassistant.helpers.dispatcher import async_dispatcher_connect +from homeassistant.util import slugify + +from . import DATA_KEY, SIGNAL_STATE_UPDATED _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/volvooncall/lock.py b/homeassistant/components/volvooncall/lock.py index f281ea644..4a81f9017 100644 --- a/homeassistant/components/volvooncall/lock.py +++ b/homeassistant/components/volvooncall/lock.py @@ -2,7 +2,8 @@ import logging from homeassistant.components.lock import LockDevice -from homeassistant.components.volvooncall import VolvoEntity, DATA_KEY + +from . import DATA_KEY, VolvoEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/volvooncall/sensor.py b/homeassistant/components/volvooncall/sensor.py index 07f16e580..8921bf057 100644 --- a/homeassistant/components/volvooncall/sensor.py +++ b/homeassistant/components/volvooncall/sensor.py @@ -1,7 +1,7 @@ """Support for Volvo On Call sensors.""" import logging -from homeassistant.components.volvooncall import VolvoEntity, DATA_KEY +from . import DATA_KEY, VolvoEntity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/volvooncall/switch.py b/homeassistant/components/volvooncall/switch.py index d3985557c..372909d1e 100644 --- a/homeassistant/components/volvooncall/switch.py +++ b/homeassistant/components/volvooncall/switch.py @@ -1,9 +1,10 @@ """Support for Volvo heater.""" import logging -from homeassistant.components.volvooncall import VolvoEntity, DATA_KEY from homeassistant.helpers.entity import ToggleEntity +from . import DATA_KEY, VolvoEntity + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/vultr/binary_sensor.py b/homeassistant/components/vultr/binary_sensor.py index 149a6c282..dccb648c9 100644 --- a/homeassistant/components/vultr/binary_sensor.py +++ b/homeassistant/components/vultr/binary_sensor.py @@ -8,15 +8,16 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.const import CONF_NAME from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) -from homeassistant.components.vultr import ( - CONF_SUBSCRIPTION, ATTR_AUTO_BACKUPS, ATTR_ALLOWED_BANDWIDTH, - ATTR_CREATED_AT, ATTR_SUBSCRIPTION_ID, ATTR_SUBSCRIPTION_NAME, - ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, ATTR_DISK, - ATTR_COST_PER_MONTH, ATTR_OS, ATTR_REGION, ATTR_VCPUS, DATA_VULTR) + PLATFORM_SCHEMA, BinarySensorDevice) +from homeassistant.const import CONF_NAME +import homeassistant.helpers.config_validation as cv + +from . import ( + ATTR_ALLOWED_BANDWIDTH, ATTR_AUTO_BACKUPS, ATTR_COST_PER_MONTH, + ATTR_CREATED_AT, ATTR_DISK, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, + ATTR_MEMORY, ATTR_OS, ATTR_REGION, ATTR_SUBSCRIPTION_ID, + ATTR_SUBSCRIPTION_NAME, ATTR_VCPUS, CONF_SUBSCRIPTION, DATA_VULTR) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/vultr/sensor.py b/homeassistant/components/vultr/sensor.py index a727e5bd2..7ca731cab 100644 --- a/homeassistant/components/vultr/sensor.py +++ b/homeassistant/components/vultr/sensor.py @@ -9,13 +9,14 @@ import logging import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.components.vultr import ( - ATTR_CURRENT_BANDWIDTH_USED, ATTR_PENDING_CHARGES, CONF_SUBSCRIPTION, - DATA_VULTR) from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_NAME import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import ( + ATTR_CURRENT_BANDWIDTH_USED, ATTR_PENDING_CHARGES, CONF_SUBSCRIPTION, + DATA_VULTR) + _LOGGER = logging.getLogger(__name__) DEFAULT_NAME = 'Vultr {} {}' diff --git a/homeassistant/components/vultr/switch.py b/homeassistant/components/vultr/switch.py index 874d1979d..1f7d9ceaa 100644 --- a/homeassistant/components/vultr/switch.py +++ b/homeassistant/components/vultr/switch.py @@ -8,14 +8,15 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice from homeassistant.const import CONF_NAME -from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA) -from homeassistant.components.vultr import ( - CONF_SUBSCRIPTION, ATTR_AUTO_BACKUPS, ATTR_ALLOWED_BANDWIDTH, - ATTR_CREATED_AT, ATTR_SUBSCRIPTION_ID, ATTR_SUBSCRIPTION_NAME, - ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, ATTR_MEMORY, ATTR_DISK, - ATTR_COST_PER_MONTH, ATTR_OS, ATTR_REGION, ATTR_VCPUS, DATA_VULTR) +import homeassistant.helpers.config_validation as cv + +from . import ( + ATTR_ALLOWED_BANDWIDTH, ATTR_AUTO_BACKUPS, ATTR_COST_PER_MONTH, + ATTR_CREATED_AT, ATTR_DISK, ATTR_IPV4_ADDRESS, ATTR_IPV6_ADDRESS, + ATTR_MEMORY, ATTR_OS, ATTR_REGION, ATTR_SUBSCRIPTION_ID, + ATTR_SUBSCRIPTION_NAME, ATTR_VCPUS, CONF_SUBSCRIPTION, DATA_VULTR) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/w800rf32/binary_sensor.py b/homeassistant/components/w800rf32/binary_sensor.py index 855a5f3ed..c94248349 100644 --- a/homeassistant/components/w800rf32/binary_sensor.py +++ b/homeassistant/components/w800rf32/binary_sensor.py @@ -5,13 +5,13 @@ import voluptuous as vol from homeassistant.components.binary_sensor import ( DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice) -from homeassistant.components.w800rf32 import (W800RF32_DEVICE) -from homeassistant.const import (CONF_DEVICE_CLASS, CONF_NAME, CONF_DEVICES) +from homeassistant.const import CONF_DEVICE_CLASS, CONF_DEVICES, CONF_NAME from homeassistant.core import callback -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers import event as evt +from homeassistant.helpers import config_validation as cv, event as evt +from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.util import dt as dt_util -from homeassistant.helpers.dispatcher import (async_dispatcher_connect) + +from . import W800RF32_DEVICE _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/water_heater/demo.py b/homeassistant/components/water_heater/demo.py index b551993ac..37ae535cd 100644 --- a/homeassistant/components/water_heater/demo.py +++ b/homeassistant/components/water_heater/demo.py @@ -1,10 +1,9 @@ """Demo platform that offers a fake water heater device.""" -from homeassistant.components.water_heater import ( - WaterHeaterDevice, - SUPPORT_TARGET_TEMPERATURE, - SUPPORT_AWAY_MODE, - SUPPORT_OPERATION_MODE) -from homeassistant.const import TEMP_FAHRENHEIT, ATTR_TEMPERATURE, TEMP_CELSIUS +from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT + +from . import ( + SUPPORT_AWAY_MODE, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, + WaterHeaterDevice) SUPPORT_FLAGS_HEATER = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE | SUPPORT_AWAY_MODE) diff --git a/homeassistant/components/waterfurnace/sensor.py b/homeassistant/components/waterfurnace/sensor.py index 65632f514..8a43a7dac 100644 --- a/homeassistant/components/waterfurnace/sensor.py +++ b/homeassistant/components/waterfurnace/sensor.py @@ -6,14 +6,13 @@ https://home-assistant.io/components/sensor.waterfurnace/ """ from homeassistant.components.sensor import ENTITY_ID_FORMAT -from homeassistant.components.waterfurnace import ( - DOMAIN as WF_DOMAIN, UPDATE_TOPIC -) from homeassistant.const import TEMP_FAHRENHEIT from homeassistant.core import callback from homeassistant.helpers.entity import Entity from homeassistant.util import slugify +from . import DOMAIN as WF_DOMAIN, UPDATE_TOPIC + class WFSensorConfig: """Water Furnace Sensor configuration.""" diff --git a/homeassistant/components/wink/alarm_control_panel.py b/homeassistant/components/wink/alarm_control_panel.py index 594198ddd..73ca9a3ca 100644 --- a/homeassistant/components/wink/alarm_control_panel.py +++ b/homeassistant/components/wink/alarm_control_panel.py @@ -2,10 +2,11 @@ import logging import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.wink import DOMAIN, WinkDevice from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED) +from . import DOMAIN, WinkDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['wink'] diff --git a/homeassistant/components/wink/binary_sensor.py b/homeassistant/components/wink/binary_sensor.py index 12e1b557a..f3757d7bf 100644 --- a/homeassistant/components/wink/binary_sensor.py +++ b/homeassistant/components/wink/binary_sensor.py @@ -2,7 +2,8 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.wink import DOMAIN, WinkDevice + +from . import DOMAIN, WinkDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/wink/climate.py b/homeassistant/components/wink/climate.py index efd8eecf5..f5e75c1fb 100644 --- a/homeassistant/components/wink/climate.py +++ b/homeassistant/components/wink/climate.py @@ -4,17 +4,17 @@ import logging from homeassistant.components.climate import ClimateDevice from homeassistant.components.climate.const import ( ATTR_CURRENT_HUMIDITY, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, - STATE_AUTO, STATE_COOL, STATE_ECO, - STATE_FAN_ONLY, STATE_HEAT, SUPPORT_AUX_HEAT, - SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE, + STATE_AUTO, STATE_COOL, STATE_ECO, STATE_FAN_ONLY, STATE_HEAT, + SUPPORT_AUX_HEAT, SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW) -from homeassistant.components.wink import DOMAIN, WinkDevice from homeassistant.const import ( ATTR_TEMPERATURE, PRECISION_TENTHS, STATE_OFF, STATE_ON, STATE_UNKNOWN, TEMP_CELSIUS) from homeassistant.helpers.temperature import display_temp as show_temp +from . import DOMAIN, WinkDevice + _LOGGER = logging.getLogger(__name__) ATTR_ECO_TARGET = 'eco_target' diff --git a/homeassistant/components/wink/cover.py b/homeassistant/components/wink/cover.py index 19ff79259..f4c4841c2 100644 --- a/homeassistant/components/wink/cover.py +++ b/homeassistant/components/wink/cover.py @@ -1,6 +1,7 @@ """Support for Wink covers.""" -from homeassistant.components.cover import CoverDevice, ATTR_POSITION -from homeassistant.components.wink import WinkDevice, DOMAIN +from homeassistant.components.cover import ATTR_POSITION, CoverDevice + +from . import DOMAIN, WinkDevice DEPENDENCIES = ['wink'] diff --git a/homeassistant/components/wink/fan.py b/homeassistant/components/wink/fan.py index 5bc6e03c4..52a27eb3c 100644 --- a/homeassistant/components/wink/fan.py +++ b/homeassistant/components/wink/fan.py @@ -2,9 +2,10 @@ import logging from homeassistant.components.fan import ( - SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SUPPORT_DIRECTION, - SUPPORT_SET_SPEED, FanEntity) -from homeassistant.components.wink import DOMAIN, WinkDevice + SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM, SUPPORT_DIRECTION, SUPPORT_SET_SPEED, + FanEntity) + +from . import DOMAIN, WinkDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/wink/light.py b/homeassistant/components/wink/light.py index 14a983154..95747bcc1 100644 --- a/homeassistant/components/wink/light.py +++ b/homeassistant/components/wink/light.py @@ -1,11 +1,12 @@ """Support for Wink lights.""" from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, - SUPPORT_COLOR_TEMP, SUPPORT_COLOR, Light) -from homeassistant.components.wink import DOMAIN, WinkDevice + SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light) from homeassistant.util import color as color_util -from homeassistant.util.color import \ - color_temperature_mired_to_kelvin as mired_to_kelvin +from homeassistant.util.color import ( + color_temperature_mired_to_kelvin as mired_to_kelvin) + +from . import DOMAIN, WinkDevice DEPENDENCIES = ['wink'] diff --git a/homeassistant/components/wink/lock.py b/homeassistant/components/wink/lock.py index 0ef4f30dc..8e6fb9b28 100644 --- a/homeassistant/components/wink/lock.py +++ b/homeassistant/components/wink/lock.py @@ -4,11 +4,12 @@ import logging import voluptuous as vol from homeassistant.components.lock import LockDevice -from homeassistant.components.wink import DOMAIN, WinkDevice from homeassistant.const import ( ATTR_CODE, ATTR_ENTITY_ID, ATTR_NAME, STATE_UNKNOWN) import homeassistant.helpers.config_validation as cv +from . import DOMAIN, WinkDevice + DEPENDENCIES = ['wink'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/wink/scene.py b/homeassistant/components/wink/scene.py index d05fe58a4..e77402c4d 100644 --- a/homeassistant/components/wink/scene.py +++ b/homeassistant/components/wink/scene.py @@ -2,7 +2,8 @@ import logging from homeassistant.components.scene import Scene -from homeassistant.components.wink import DOMAIN, WinkDevice + +from . import DOMAIN, WinkDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/wink/sensor.py b/homeassistant/components/wink/sensor.py index ab61769c9..3dfd704d5 100644 --- a/homeassistant/components/wink/sensor.py +++ b/homeassistant/components/wink/sensor.py @@ -1,9 +1,10 @@ """Support for Wink sensors.""" import logging -from homeassistant.components.wink import DOMAIN, WinkDevice from homeassistant.const import TEMP_CELSIUS +from . import DOMAIN, WinkDevice + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['wink'] diff --git a/homeassistant/components/wink/switch.py b/homeassistant/components/wink/switch.py index cd5502687..6ee777dd1 100644 --- a/homeassistant/components/wink/switch.py +++ b/homeassistant/components/wink/switch.py @@ -1,9 +1,10 @@ """Support for Wink switches.""" import logging -from homeassistant.components.wink import DOMAIN, WinkDevice from homeassistant.helpers.entity import ToggleEntity +from . import DOMAIN, WinkDevice + DEPENDENCIES = ['wink'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/wink/water_heater.py b/homeassistant/components/wink/water_heater.py index 34cd86a50..343f4a766 100644 --- a/homeassistant/components/wink/water_heater.py +++ b/homeassistant/components/wink/water_heater.py @@ -2,14 +2,12 @@ import logging from homeassistant.components.water_heater import ( - ATTR_TEMPERATURE, STATE_ECO, STATE_ELECTRIC, - STATE_PERFORMANCE, SUPPORT_AWAY_MODE, STATE_HEAT_PUMP, - STATE_GAS, STATE_HIGH_DEMAND, - SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, - WaterHeaterDevice) -from homeassistant.components.wink import DOMAIN, WinkDevice -from homeassistant.const import ( - STATE_OFF, STATE_UNKNOWN, TEMP_CELSIUS) + ATTR_TEMPERATURE, STATE_ECO, STATE_ELECTRIC, STATE_GAS, STATE_HEAT_PUMP, + STATE_HIGH_DEMAND, STATE_PERFORMANCE, SUPPORT_AWAY_MODE, + SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, WaterHeaterDevice) +from homeassistant.const import STATE_OFF, STATE_UNKNOWN, TEMP_CELSIUS + +from . import DOMAIN, WinkDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/wirelesstag/binary_sensor.py b/homeassistant/components/wirelesstag/binary_sensor.py index 6f2c24a77..aefa5ed34 100644 --- a/homeassistant/components/wirelesstag/binary_sensor.py +++ b/homeassistant/components/wirelesstag/binary_sensor.py @@ -3,17 +3,16 @@ import logging import voluptuous as vol -from homeassistant.core import callback -from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.components.binary_sensor import ( - BinarySensorDevice, PLATFORM_SCHEMA) -from homeassistant.components.wirelesstag import ( - DOMAIN as WIRELESSTAG_DOMAIN, - SIGNAL_BINARY_EVENT_UPDATE, - WirelessTagBaseSensor) -from homeassistant.const import ( - CONF_MONITORED_CONDITIONS, STATE_ON, STATE_OFF) + PLATFORM_SCHEMA, BinarySensorDevice) +from homeassistant.const import CONF_MONITORED_CONDITIONS, STATE_OFF, STATE_ON +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ( + DOMAIN as WIRELESSTAG_DOMAIN, SIGNAL_BINARY_EVENT_UPDATE, + WirelessTagBaseSensor) DEPENDENCIES = ['wirelesstag'] diff --git a/homeassistant/components/wirelesstag/sensor.py b/homeassistant/components/wirelesstag/sensor.py index 3703e214d..ca26e07b9 100644 --- a/homeassistant/components/wirelesstag/sensor.py +++ b/homeassistant/components/wirelesstag/sensor.py @@ -1,17 +1,16 @@ """Sensor support for Wireless Sensor Tags platform.""" import logging + import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA +from homeassistant.const import CONF_MONITORED_CONDITIONS from homeassistant.core import callback -from homeassistant.helpers.dispatcher import async_dispatcher_connect -from homeassistant.const import ( - CONF_MONITORED_CONDITIONS) -from homeassistant.components.wirelesstag import ( - DOMAIN as WIRELESSTAG_DOMAIN, - SIGNAL_TAG_UPDATE, - WirelessTagBaseSensor) import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.dispatcher import async_dispatcher_connect + +from . import ( + DOMAIN as WIRELESSTAG_DOMAIN, SIGNAL_TAG_UPDATE, WirelessTagBaseSensor) DEPENDENCIES = ['wirelesstag'] diff --git a/homeassistant/components/wirelesstag/switch.py b/homeassistant/components/wirelesstag/switch.py index 913438e9d..4a2b64acd 100644 --- a/homeassistant/components/wirelesstag/switch.py +++ b/homeassistant/components/wirelesstag/switch.py @@ -3,15 +3,12 @@ import logging import voluptuous as vol - -from homeassistant.components.wirelesstag import ( - DOMAIN as WIRELESSTAG_DOMAIN, - WirelessTagBaseSensor) from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice -from homeassistant.const import ( - CONF_MONITORED_CONDITIONS) +from homeassistant.const import CONF_MONITORED_CONDITIONS import homeassistant.helpers.config_validation as cv +from . import DOMAIN as WIRELESSTAG_DOMAIN, WirelessTagBaseSensor + DEPENDENCIES = ['wirelesstag'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xiaomi_aqara/binary_sensor.py b/homeassistant/components/xiaomi_aqara/binary_sensor.py index afffb71ba..7eb72e91e 100644 --- a/homeassistant/components/xiaomi_aqara/binary_sensor.py +++ b/homeassistant/components/xiaomi_aqara/binary_sensor.py @@ -2,11 +2,11 @@ import logging from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY, - XiaomiDevice) from homeassistant.core import callback from homeassistant.helpers.event import async_call_later +from . import PY_XIAOMI_GATEWAY, XiaomiDevice + _LOGGER = logging.getLogger(__name__) NO_CLOSE = 'no_close' diff --git a/homeassistant/components/xiaomi_aqara/cover.py b/homeassistant/components/xiaomi_aqara/cover.py index ead2c0e92..f4bf1f269 100644 --- a/homeassistant/components/xiaomi_aqara/cover.py +++ b/homeassistant/components/xiaomi_aqara/cover.py @@ -1,9 +1,9 @@ """Support for Xiaomi curtain.""" import logging -from homeassistant.components.cover import CoverDevice, ATTR_POSITION -from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY, - XiaomiDevice) +from homeassistant.components.cover import ATTR_POSITION, CoverDevice + +from . import PY_XIAOMI_GATEWAY, XiaomiDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xiaomi_aqara/light.py b/homeassistant/components/xiaomi_aqara/light.py index 30433ccea..d0fbdea8f 100644 --- a/homeassistant/components/xiaomi_aqara/light.py +++ b/homeassistant/components/xiaomi_aqara/light.py @@ -1,14 +1,14 @@ """Support for Xiaomi Gateway Light.""" +import binascii import logging import struct -import binascii -from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY, - XiaomiDevice) -from homeassistant.components.light import (ATTR_BRIGHTNESS, ATTR_HS_COLOR, - SUPPORT_BRIGHTNESS, - SUPPORT_COLOR, Light) + +from homeassistant.components.light import ( + ATTR_BRIGHTNESS, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light) import homeassistant.util.color as color_util +from . import PY_XIAOMI_GATEWAY, XiaomiDevice + _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xiaomi_aqara/lock.py b/homeassistant/components/xiaomi_aqara/lock.py index f19492664..56d68f38b 100644 --- a/homeassistant/components/xiaomi_aqara/lock.py +++ b/homeassistant/components/xiaomi_aqara/lock.py @@ -1,11 +1,12 @@ """Support for Xiaomi Aqara locks.""" import logging -from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY, - XiaomiDevice) + from homeassistant.components.lock import LockDevice -from homeassistant.const import (STATE_LOCKED, STATE_UNLOCKED) -from homeassistant.helpers.event import async_call_later +from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED from homeassistant.core import callback +from homeassistant.helpers.event import async_call_later + +from . import PY_XIAOMI_GATEWAY, XiaomiDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xiaomi_aqara/sensor.py b/homeassistant/components/xiaomi_aqara/sensor.py index 133814e21..c5cc00f14 100644 --- a/homeassistant/components/xiaomi_aqara/sensor.py +++ b/homeassistant/components/xiaomi_aqara/sensor.py @@ -1,11 +1,11 @@ """Support for Xiaomi Aqara sensors.""" import logging -from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY, - XiaomiDevice) from homeassistant.const import ( - DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE, - TEMP_CELSIUS, DEVICE_CLASS_PRESSURE) + DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_PRESSURE, + DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS) + +from . import PY_XIAOMI_GATEWAY, XiaomiDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xiaomi_aqara/switch.py b/homeassistant/components/xiaomi_aqara/switch.py index c3cde8ede..211f9d127 100644 --- a/homeassistant/components/xiaomi_aqara/switch.py +++ b/homeassistant/components/xiaomi_aqara/switch.py @@ -2,8 +2,8 @@ import logging from homeassistant.components.switch import SwitchDevice -from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY, - XiaomiDevice) + +from . import PY_XIAOMI_GATEWAY, XiaomiDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xs1/climate.py b/homeassistant/components/xs1/climate.py index e57976147..080b87c13 100644 --- a/homeassistant/components/xs1/climate.py +++ b/homeassistant/components/xs1/climate.py @@ -3,12 +3,11 @@ from functools import partial import logging from homeassistant.components.climate import ClimateDevice -from homeassistant.components.climate.const import ( - SUPPORT_TARGET_TEMPERATURE) -from homeassistant.components.xs1 import ( - ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS, XS1DeviceEntity) +from homeassistant.components.climate.const import SUPPORT_TARGET_TEMPERATURE from homeassistant.const import ATTR_TEMPERATURE +from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS, XS1DeviceEntity + DEPENDENCIES = ['xs1'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xs1/sensor.py b/homeassistant/components/xs1/sensor.py index 9de91a6b0..f5fdcf1fb 100644 --- a/homeassistant/components/xs1/sensor.py +++ b/homeassistant/components/xs1/sensor.py @@ -1,10 +1,10 @@ """Support for XS1 sensors.""" import logging -from homeassistant.components.xs1 import ( - ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS, XS1DeviceEntity) from homeassistant.helpers.entity import Entity +from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS, XS1DeviceEntity + DEPENDENCIES = ['xs1'] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/xs1/switch.py b/homeassistant/components/xs1/switch.py index 35568587b..d8b344fc7 100644 --- a/homeassistant/components/xs1/switch.py +++ b/homeassistant/components/xs1/switch.py @@ -1,10 +1,10 @@ """Support for XS1 switches.""" import logging -from homeassistant.components.xs1 import ( - ACTUATORS, DOMAIN as COMPONENT_DOMAIN, XS1DeviceEntity) from homeassistant.helpers.entity import ToggleEntity +from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, XS1DeviceEntity + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['xs1'] diff --git a/homeassistant/components/zamg/weather.py b/homeassistant/components/zamg/weather.py index 01a927afb..bc90a56cc 100644 --- a/homeassistant/components/zamg/weather.py +++ b/homeassistant/components/zamg/weather.py @@ -3,9 +3,6 @@ import logging import voluptuous as vol -# Reuse data and API logic from the sensor implementation -from homeassistant.components.zamg.sensor import ( - ATTRIBUTION, CONF_STATION_ID, ZamgData, closest_station, zamg_stations) from homeassistant.components.weather import ( ATTR_WEATHER_HUMIDITY, ATTR_WEATHER_PRESSURE, ATTR_WEATHER_TEMPERATURE, ATTR_WEATHER_WIND_BEARING, ATTR_WEATHER_WIND_SPEED, PLATFORM_SCHEMA, @@ -14,6 +11,10 @@ from homeassistant.const import ( CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_CELSIUS) from homeassistant.helpers import config_validation as cv +# Reuse data and API logic from the sensor implementation +from .sensor import ( + ATTRIBUTION, CONF_STATION_ID, ZamgData, closest_station, zamg_stations) + _LOGGER = logging.getLogger(__name__) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ diff --git a/homeassistant/components/zigbee/binary_sensor.py b/homeassistant/components/zigbee/binary_sensor.py index eec1832f0..ccf4e70df 100644 --- a/homeassistant/components/zigbee/binary_sensor.py +++ b/homeassistant/components/zigbee/binary_sensor.py @@ -2,8 +2,8 @@ import voluptuous as vol from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.zigbee import ( - ZigBeeDigitalIn, ZigBeeDigitalInConfig, PLATFORM_SCHEMA) + +from . import PLATFORM_SCHEMA, ZigBeeDigitalIn, ZigBeeDigitalInConfig CONF_ON_STATE = 'on_state' diff --git a/homeassistant/components/zigbee/light.py b/homeassistant/components/zigbee/light.py index e5016900b..b9be0d893 100644 --- a/homeassistant/components/zigbee/light.py +++ b/homeassistant/components/zigbee/light.py @@ -2,8 +2,8 @@ import voluptuous as vol from homeassistant.components.light import Light -from homeassistant.components.zigbee import ( - ZigBeeDigitalOut, ZigBeeDigitalOutConfig, PLATFORM_SCHEMA) + +from . import PLATFORM_SCHEMA, ZigBeeDigitalOut, ZigBeeDigitalOutConfig CONF_ON_STATE = 'on_state' diff --git a/homeassistant/components/zigbee/sensor.py b/homeassistant/components/zigbee/sensor.py index 48503e396..48301ac97 100644 --- a/homeassistant/components/zigbee/sensor.py +++ b/homeassistant/components/zigbee/sensor.py @@ -1,14 +1,15 @@ """Support for Zigbee sensors.""" -import logging from binascii import hexlify +import logging import voluptuous as vol from homeassistant.components import zigbee -from homeassistant.components.zigbee import PLATFORM_SCHEMA from homeassistant.const import TEMP_CELSIUS from homeassistant.helpers.entity import Entity +from . import PLATFORM_SCHEMA + _LOGGER = logging.getLogger(__name__) CONF_TYPE = 'type' diff --git a/homeassistant/components/zigbee/switch.py b/homeassistant/components/zigbee/switch.py index ef36e17d7..ddfd47a04 100644 --- a/homeassistant/components/zigbee/switch.py +++ b/homeassistant/components/zigbee/switch.py @@ -2,8 +2,8 @@ import voluptuous as vol from homeassistant.components.switch import SwitchDevice -from homeassistant.components.zigbee import ( - ZigBeeDigitalOut, ZigBeeDigitalOutConfig, PLATFORM_SCHEMA) + +from . import PLATFORM_SCHEMA, ZigBeeDigitalOut, ZigBeeDigitalOutConfig DEPENDENCIES = ['zigbee'] diff --git a/homeassistant/components/zoneminder/binary_sensor.py b/homeassistant/components/zoneminder/binary_sensor.py index f20f09e70..ce59d4573 100644 --- a/homeassistant/components/zoneminder/binary_sensor.py +++ b/homeassistant/components/zoneminder/binary_sensor.py @@ -1,7 +1,7 @@ """Support for ZoneMinder binary sensors.""" from homeassistant.components.binary_sensor import BinarySensorDevice -from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN +from . import DOMAIN as ZONEMINDER_DOMAIN DEPENDENCIES = ['zoneminder'] diff --git a/homeassistant/components/zoneminder/camera.py b/homeassistant/components/zoneminder/camera.py index f9dd8718b..fe3333fa3 100644 --- a/homeassistant/components/zoneminder/camera.py +++ b/homeassistant/components/zoneminder/camera.py @@ -1,10 +1,11 @@ """Support for ZoneMinder camera streaming.""" import logging -from homeassistant.const import CONF_NAME, CONF_VERIFY_SSL from homeassistant.components.mjpeg.camera import ( CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera, filter_urllib3_logging) -from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN +from homeassistant.const import CONF_NAME, CONF_VERIFY_SSL + +from . import DOMAIN as ZONEMINDER_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/zoneminder/sensor.py b/homeassistant/components/zoneminder/sensor.py index 9eb6beb49..e205d9214 100644 --- a/homeassistant/components/zoneminder/sensor.py +++ b/homeassistant/components/zoneminder/sensor.py @@ -3,12 +3,13 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN from homeassistant.const import CONF_MONITORED_CONDITIONS +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity +from . import DOMAIN as ZONEMINDER_DOMAIN + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['zoneminder'] diff --git a/homeassistant/components/zoneminder/switch.py b/homeassistant/components/zoneminder/switch.py index b411a148d..78e72c5fd 100644 --- a/homeassistant/components/zoneminder/switch.py +++ b/homeassistant/components/zoneminder/switch.py @@ -3,11 +3,12 @@ import logging import voluptuous as vol -from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA) -from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN -from homeassistant.const import (CONF_COMMAND_ON, CONF_COMMAND_OFF) +from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice +from homeassistant.const import CONF_COMMAND_OFF, CONF_COMMAND_ON import homeassistant.helpers.config_validation as cv +from . import DOMAIN as ZONEMINDER_DOMAIN + _LOGGER = logging.getLogger(__name__) DEPENDENCIES = ['zoneminder']