From 9fbb345ce0022596c95f140474c236db3edfdc92 Mon Sep 17 00:00:00 2001 From: springstan <46536646+springstan@users.noreply.github.com> Date: Sun, 1 Dec 2019 06:23:39 +0100 Subject: [PATCH] Move imports to top for tradfri (#29247) --- homeassistant/components/tradfri/__init__.py | 29 ++++++++++--------- .../components/tradfri/base_class.py | 1 + .../components/tradfri/config_flow.py | 15 +++++----- homeassistant/components/tradfri/const.py | 2 +- homeassistant/components/tradfri/cover.py | 5 ++-- homeassistant/components/tradfri/light.py | 13 +++++---- homeassistant/components/tradfri/sensor.py | 3 +- homeassistant/components/tradfri/switch.py | 3 +- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py index bb445647310..a797607e243 100644 --- a/homeassistant/components/tradfri/__init__.py +++ b/homeassistant/components/tradfri/__init__.py @@ -1,32 +1,33 @@ """Support for IKEA Tradfri.""" import logging -import voluptuous as vol from pytradfri import Gateway, RequestError from pytradfri.api.aiocoap_api import APIFactory +import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant import config_entries from homeassistant.const import EVENT_HOMEASSISTANT_STOP from homeassistant.exceptions import ConfigEntryNotReady +import homeassistant.helpers.config_validation as cv from homeassistant.util.json import load_json + from . import config_flow # noqa: F401 from .const import ( - DOMAIN, - CONFIG_FILE, - KEY_GATEWAY, - KEY_API, - CONF_ALLOW_TRADFRI_GROUPS, - DEFAULT_ALLOW_TRADFRI_GROUPS, - TRADFRI_DEVICE_TYPES, - ATTR_TRADFRI_MANUFACTURER, ATTR_TRADFRI_GATEWAY, ATTR_TRADFRI_GATEWAY_MODEL, - CONF_IMPORT_GROUPS, - CONF_IDENTITY, - CONF_HOST, - CONF_KEY, + ATTR_TRADFRI_MANUFACTURER, + CONF_ALLOW_TRADFRI_GROUPS, CONF_GATEWAY_ID, + CONF_HOST, + CONF_IDENTITY, + CONF_IMPORT_GROUPS, + CONF_KEY, + CONFIG_FILE, + DEFAULT_ALLOW_TRADFRI_GROUPS, + DOMAIN, + KEY_API, + KEY_GATEWAY, + TRADFRI_DEVICE_TYPES, ) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tradfri/base_class.py b/homeassistant/components/tradfri/base_class.py index ba90fe05d1e..358056d7ef6 100644 --- a/homeassistant/components/tradfri/base_class.py +++ b/homeassistant/components/tradfri/base_class.py @@ -5,6 +5,7 @@ from pytradfri.error import PytradfriError from homeassistant.core import callback from homeassistant.helpers.entity import Entity + from .const import DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py index 24c3fbc1876..048541b5402 100644 --- a/homeassistant/components/tradfri/config_flow.py +++ b/homeassistant/components/tradfri/config_flow.py @@ -4,15 +4,18 @@ from collections import OrderedDict from uuid import uuid4 import async_timeout +from pytradfri import Gateway, RequestError +from pytradfri.api.aiocoap_api import APIFactory import voluptuous as vol from homeassistant import config_entries + from .const import ( - CONF_IMPORT_GROUPS, - CONF_IDENTITY, - CONF_HOST, - CONF_KEY, CONF_GATEWAY_ID, + CONF_HOST, + CONF_IDENTITY, + CONF_IMPORT_GROUPS, + CONF_KEY, KEY_SECURITY_CODE, ) @@ -153,8 +156,6 @@ class FlowHandler(config_entries.ConfigFlow): async def authenticate(hass, host, security_code): """Authenticate with a Tradfri hub.""" - from pytradfri.api.aiocoap_api import APIFactory - from pytradfri import RequestError identity = uuid4().hex @@ -173,8 +174,6 @@ async def authenticate(hass, host, security_code): async def get_gateway_info(hass, host, identity, key): """Return info for the gateway.""" - from pytradfri.api.aiocoap_api import APIFactory - from pytradfri import Gateway, RequestError try: factory = APIFactory(host, psk_id=identity, psk=key, loop=hass.loop) diff --git a/homeassistant/components/tradfri/const.py b/homeassistant/components/tradfri/const.py index 01d2f18501d..88225d3282a 100644 --- a/homeassistant/components/tradfri/const.py +++ b/homeassistant/components/tradfri/const.py @@ -1,5 +1,5 @@ """Consts used by Tradfri.""" -from homeassistant.components.light import SUPPORT_TRANSITION, SUPPORT_BRIGHTNESS +from homeassistant.components.light import SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION from homeassistant.const import CONF_HOST # noqa: F401 pylint: disable=unused-import ATTR_DIMMER = "dimmer" diff --git a/homeassistant/components/tradfri/cover.py b/homeassistant/components/tradfri/cover.py index ae7d6a09ce3..d978e512920 100644 --- a/homeassistant/components/tradfri/cover.py +++ b/homeassistant/components/tradfri/cover.py @@ -1,8 +1,9 @@ """Support for IKEA Tradfri covers.""" -from homeassistant.components.cover import CoverDevice, ATTR_POSITION +from homeassistant.components.cover import ATTR_POSITION, CoverDevice + from .base_class import TradfriBaseDevice -from .const import KEY_GATEWAY, KEY_API, CONF_GATEWAY_ID +from .const import CONF_GATEWAY_ID, KEY_API, KEY_GATEWAY async def async_setup_entry(hass, config_entry, async_add_entities): diff --git a/homeassistant/components/tradfri/light.py b/homeassistant/components/tradfri/light.py index 9ee3c5d6a8c..0fe826be9af 100644 --- a/homeassistant/components/tradfri/light.py +++ b/homeassistant/components/tradfri/light.py @@ -1,29 +1,30 @@ """Support for IKEA Tradfri lights.""" import logging -import homeassistant.util.color as color_util from homeassistant.components.light import ( ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ATTR_TRANSITION, - Light, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP, + Light, ) -from .base_class import TradfriBaseDevice, TradfriBaseClass +import homeassistant.util.color as color_util + +from .base_class import TradfriBaseClass, TradfriBaseDevice from .const import ( ATTR_DIMMER, ATTR_HUE, ATTR_SAT, ATTR_TRANSITION_TIME, - SUPPORTED_LIGHT_FEATURES, - SUPPORTED_GROUP_FEATURES, CONF_GATEWAY_ID, CONF_IMPORT_GROUPS, - KEY_GATEWAY, KEY_API, + KEY_GATEWAY, + SUPPORTED_GROUP_FEATURES, + SUPPORTED_LIGHT_FEATURES, ) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tradfri/sensor.py b/homeassistant/components/tradfri/sensor.py index cf797f34e3b..c3a08ab1675 100644 --- a/homeassistant/components/tradfri/sensor.py +++ b/homeassistant/components/tradfri/sensor.py @@ -1,8 +1,9 @@ """Support for IKEA Tradfri sensors.""" from homeassistant.const import DEVICE_CLASS_BATTERY + from .base_class import TradfriBaseDevice -from .const import KEY_GATEWAY, KEY_API, CONF_GATEWAY_ID +from .const import CONF_GATEWAY_ID, KEY_API, KEY_GATEWAY async def async_setup_entry(hass, config_entry, async_add_entities): diff --git a/homeassistant/components/tradfri/switch.py b/homeassistant/components/tradfri/switch.py index e1c549a1805..fffbf320c7e 100644 --- a/homeassistant/components/tradfri/switch.py +++ b/homeassistant/components/tradfri/switch.py @@ -1,7 +1,8 @@ """Support for IKEA Tradfri switches.""" from homeassistant.components.switch import SwitchDevice + from .base_class import TradfriBaseDevice -from .const import KEY_GATEWAY, KEY_API, CONF_GATEWAY_ID +from .const import CONF_GATEWAY_ID, KEY_API, KEY_GATEWAY async def async_setup_entry(hass, config_entry, async_add_entities):