diff --git a/homeassistant/components/unifi/__init__.py b/homeassistant/components/unifi/__init__.py index 4f3edf9ce79..65015b357a7 100644 --- a/homeassistant/components/unifi/__init__.py +++ b/homeassistant/components/unifi/__init__.py @@ -3,9 +3,8 @@ import voluptuous as vol from homeassistant.const import CONF_HOST from homeassistant.core import callback -from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC - import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from .config_flow import get_controller_id_from_config_entry from .const import ( diff --git a/homeassistant/components/unifi/config_flow.py b/homeassistant/components/unifi/config_flow.py index 01b97a78366..52ecab08856 100644 --- a/homeassistant/components/unifi/config_flow.py +++ b/homeassistant/components/unifi/config_flow.py @@ -2,7 +2,6 @@ import voluptuous as vol from homeassistant import config_entries -from homeassistant.core import callback from homeassistant.const import ( CONF_HOST, CONF_PASSWORD, @@ -10,6 +9,7 @@ from homeassistant.const import ( CONF_USERNAME, CONF_VERIFY_SSL, ) +from homeassistant.core import callback from .const import ( CONF_ALLOW_BANDWIDTH_SENSORS, @@ -21,10 +21,10 @@ from .const import ( CONF_TRACK_WIRED_CLIENTS, CONTROLLER_ID, DEFAULT_ALLOW_BANDWIDTH_SENSORS, + DEFAULT_DETECTION_TIME, DEFAULT_TRACK_CLIENTS, DEFAULT_TRACK_DEVICES, DEFAULT_TRACK_WIRED_CLIENTS, - DEFAULT_DETECTION_TIME, DOMAIN, LOGGER, ) diff --git a/homeassistant/components/unifi/controller.py b/homeassistant/components/unifi/controller.py index 3deb2e9040a..826491f6ba6 100644 --- a/homeassistant/components/unifi/controller.py +++ b/homeassistant/components/unifi/controller.py @@ -1,16 +1,14 @@ """UniFi Controller abstraction.""" -from datetime import timedelta - import asyncio +from datetime import timedelta import ssl -import async_timeout from aiohttp import CookieJar - import aiounifi +import async_timeout -from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.const import CONF_HOST +from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers import aiohttp_client from homeassistant.helpers.dispatcher import async_dispatcher_send @@ -22,19 +20,19 @@ from .const import ( CONF_DONT_TRACK_CLIENTS, CONF_DONT_TRACK_DEVICES, CONF_DONT_TRACK_WIRED_CLIENTS, + CONF_SITE_ID, + CONF_SSID_FILTER, CONF_TRACK_CLIENTS, CONF_TRACK_DEVICES, CONF_TRACK_WIRED_CLIENTS, - CONF_SITE_ID, - CONF_SSID_FILTER, CONTROLLER_ID, DEFAULT_ALLOW_BANDWIDTH_SENSORS, DEFAULT_BLOCK_CLIENTS, + DEFAULT_DETECTION_TIME, + DEFAULT_SSID_FILTER, DEFAULT_TRACK_CLIENTS, DEFAULT_TRACK_DEVICES, DEFAULT_TRACK_WIRED_CLIENTS, - DEFAULT_DETECTION_TIME, - DEFAULT_SSID_FILTER, DOMAIN, LOGGER, UNIFI_CONFIG, diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py index b92211c4eae..0806a2c04e3 100644 --- a/homeassistant/components/unifi/device_tracker.py +++ b/homeassistant/components/unifi/device_tracker.py @@ -1,16 +1,15 @@ """Track devices using UniFi controllers.""" import logging -from homeassistant.components.unifi.config_flow import get_controller_from_config_entry from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN from homeassistant.components.device_tracker.config_entry import ScannerEntity from homeassistant.components.device_tracker.const import SOURCE_TYPE_ROUTER +from homeassistant.components.unifi.config_flow import get_controller_from_config_entry from homeassistant.core import callback from homeassistant.helpers import entity_registry from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity_registry import DISABLED_CONFIG_ENTRY - import homeassistant.util.dt as dt_util from .const import ATTR_MANUFACTURER diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py index 82aa6f0384d..18bfbb4066e 100644 --- a/homeassistant/components/unifi/switch.py +++ b/homeassistant/components/unifi/switch.py @@ -1,8 +1,8 @@ """Support for devices connected to UniFi POE.""" import logging -from homeassistant.components.unifi.config_flow import get_controller_from_config_entry from homeassistant.components.switch import SwitchDevice +from homeassistant.components.unifi.config_flow import get_controller_from_config_entry from homeassistant.core import callback from homeassistant.helpers import entity_registry from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC diff --git a/tests/components/unifi/test_config_flow.py b/tests/components/unifi/test_config_flow.py index aea4d565f3d..1b973aee9a5 100644 --- a/tests/components/unifi/test_config_flow.py +++ b/tests/components/unifi/test_config_flow.py @@ -1,10 +1,10 @@ """Test UniFi config flow.""" +import aiounifi from asynctest import patch from homeassistant.components import unifi from homeassistant.components.unifi import config_flow from homeassistant.components.unifi.const import CONF_CONTROLLER, CONF_SITE_ID - from homeassistant.const import ( CONF_HOST, CONF_PASSWORD, @@ -15,8 +15,6 @@ from homeassistant.const import ( from tests.common import MockConfigEntry -import aiounifi - async def test_flow_works(hass, aioclient_mock): """Test config flow.""" diff --git a/tests/components/unifi/test_controller.py b/tests/components/unifi/test_controller.py index 2b64e56cd99..c86e2f11538 100644 --- a/tests/components/unifi/test_controller.py +++ b/tests/components/unifi/test_controller.py @@ -2,12 +2,11 @@ from collections import deque from datetime import timedelta +import aiounifi from asynctest import Mock, patch - import pytest from homeassistant import config_entries -from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.components import unifi from homeassistant.components.unifi.const import ( CONF_CONTROLLER, @@ -22,7 +21,7 @@ from homeassistant.const import ( CONF_USERNAME, CONF_VERIFY_SSL, ) -import aiounifi +from homeassistant.exceptions import ConfigEntryNotReady CONTROLLER_HOST = { "hostname": "controller_host", diff --git a/tests/components/unifi/test_device_tracker.py b/tests/components/unifi/test_device_tracker.py index 29b16553757..634247a5283 100644 --- a/tests/components/unifi/test_device_tracker.py +++ b/tests/components/unifi/test_device_tracker.py @@ -4,6 +4,7 @@ from datetime import timedelta from homeassistant import config_entries from homeassistant.components import unifi +import homeassistant.components.device_tracker as device_tracker from homeassistant.components.unifi.const import ( CONF_SSID_FILTER, CONF_TRACK_DEVICES, @@ -12,8 +13,6 @@ from homeassistant.components.unifi.const import ( from homeassistant.const import STATE_UNAVAILABLE from homeassistant.helpers import entity_registry from homeassistant.setup import async_setup_component - -import homeassistant.components.device_tracker as device_tracker import homeassistant.util.dt as dt_util from .test_controller import ENTRY_CONFIG, SITES, setup_unifi_integration diff --git a/tests/components/unifi/test_init.py b/tests/components/unifi/test_init.py index 6b17b803390..1f5a3852e16 100644 --- a/tests/components/unifi/test_init.py +++ b/tests/components/unifi/test_init.py @@ -2,11 +2,9 @@ from unittest.mock import Mock, patch from homeassistant.components import unifi - from homeassistant.setup import async_setup_component - -from tests.common import mock_coro, MockConfigEntry +from tests.common import MockConfigEntry, mock_coro async def test_setup_with_no_config(hass): diff --git a/tests/components/unifi/test_sensor.py b/tests/components/unifi/test_sensor.py index f591801a966..8819f2f33ae 100644 --- a/tests/components/unifi/test_sensor.py +++ b/tests/components/unifi/test_sensor.py @@ -2,9 +2,8 @@ from copy import deepcopy from homeassistant.components import unifi -from homeassistant.setup import async_setup_component - import homeassistant.components.sensor as sensor +from homeassistant.setup import async_setup_component from .test_controller import ENTRY_CONFIG, SITES, setup_unifi_integration diff --git a/tests/components/unifi/test_switch.py b/tests/components/unifi/test_switch.py index 3d754fb5dff..30f9e990421 100644 --- a/tests/components/unifi/test_switch.py +++ b/tests/components/unifi/test_switch.py @@ -3,11 +3,10 @@ from copy import deepcopy from homeassistant import config_entries from homeassistant.components import unifi +import homeassistant.components.switch as switch from homeassistant.helpers import entity_registry from homeassistant.setup import async_setup_component -import homeassistant.components.switch as switch - from .test_controller import ( CONTROLLER_HOST, ENTRY_CONFIG,