From f355570f17c05798e4380565e00b278ca01df625 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 17:57:28 +0100 Subject: [PATCH] use isort to sort imports according to PEP8 for config (#29628) --- homeassistant/components/config/__init__.py | 4 ++-- homeassistant/components/config/area_registry.py | 1 - homeassistant/components/config/auth.py | 1 - .../components/config/auth_provider_homeassistant.py | 1 - homeassistant/components/config/automation.py | 2 +- homeassistant/components/config/core.py | 4 ++-- homeassistant/components/config/entity_registry.py | 4 ++-- homeassistant/components/config/group.py | 2 +- homeassistant/components/config/scene.py | 2 +- homeassistant/components/config/script.py | 2 +- tests/components/config/test_area_registry.py | 1 + tests/components/config/test_auth.py | 2 +- tests/components/config/test_config_entries.py | 6 +++--- tests/components/config/test_core.py | 1 + tests/components/config/test_device_registry.py | 1 + tests/components/config/test_entity_registry.py | 5 +++-- tests/components/config/test_group.py | 3 +-- tests/components/config/test_init.py | 6 +++--- tests/components/config/test_zwave.py | 3 +-- 19 files changed, 25 insertions(+), 26 deletions(-) diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py index 5a66c1fc5d..5873cdc327 100644 --- a/homeassistant/components/config/__init__.py +++ b/homeassistant/components/config/__init__.py @@ -6,11 +6,11 @@ import os import voluptuous as vol from homeassistant.components.http import HomeAssistantView -from homeassistant.const import EVENT_COMPONENT_LOADED, CONF_ID +from homeassistant.const import CONF_ID, EVENT_COMPONENT_LOADED from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import ATTR_COMPONENT -from homeassistant.util.yaml import load_yaml, dump +from homeassistant.util.yaml import dump, load_yaml DOMAIN = "config" SECTIONS = ( diff --git a/homeassistant/components/config/area_registry.py b/homeassistant/components/config/area_registry.py index 9c8853ac78..81daf35339 100644 --- a/homeassistant/components/config/area_registry.py +++ b/homeassistant/components/config/area_registry.py @@ -9,7 +9,6 @@ from homeassistant.components.websocket_api.decorators import ( from homeassistant.core import callback from homeassistant.helpers.area_registry import async_get_registry - WS_TYPE_LIST = "config/area_registry/list" SCHEMA_WS_LIST = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend( {vol.Required("type"): WS_TYPE_LIST} diff --git a/homeassistant/components/config/auth.py b/homeassistant/components/config/auth.py index 977bae3608..361367ffb4 100644 --- a/homeassistant/components/config/auth.py +++ b/homeassistant/components/config/auth.py @@ -3,7 +3,6 @@ import voluptuous as vol from homeassistant.components import websocket_api - WS_TYPE_LIST = "config/auth/list" SCHEMA_WS_LIST = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend( {vol.Required("type"): WS_TYPE_LIST} diff --git a/homeassistant/components/config/auth_provider_homeassistant.py b/homeassistant/components/config/auth_provider_homeassistant.py index 817675db23..dec7fb24d2 100644 --- a/homeassistant/components/config/auth_provider_homeassistant.py +++ b/homeassistant/components/config/auth_provider_homeassistant.py @@ -4,7 +4,6 @@ import voluptuous as vol from homeassistant.auth.providers import homeassistant as auth_ha from homeassistant.components import websocket_api - WS_TYPE_CREATE = "config/auth_provider/homeassistant/create" SCHEMA_WS_CREATE = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend( { diff --git a/homeassistant/components/config/automation.py b/homeassistant/components/config/automation.py index 0e9b4053b7..d7bb1ef988 100644 --- a/homeassistant/components/config/automation.py +++ b/homeassistant/components/config/automation.py @@ -4,8 +4,8 @@ import uuid from homeassistant.components.automation import DOMAIN, PLATFORM_SCHEMA from homeassistant.components.automation.config import async_validate_config_item -from homeassistant.const import CONF_ID, SERVICE_RELOAD from homeassistant.config import AUTOMATION_CONFIG_PATH +from homeassistant.const import CONF_ID, SERVICE_RELOAD import homeassistant.helpers.config_validation as cv from . import EditIdBasedConfigView diff --git a/homeassistant/components/config/core.py b/homeassistant/components/config/core.py index 073f8f23d6..e9ceb7eac5 100644 --- a/homeassistant/components/config/core.py +++ b/homeassistant/components/config/core.py @@ -2,10 +2,10 @@ import voluptuous as vol +from homeassistant.components import websocket_api from homeassistant.components.http import HomeAssistantView from homeassistant.config import async_check_ha_config_file -from homeassistant.components import websocket_api -from homeassistant.const import CONF_UNIT_SYSTEM_METRIC, CONF_UNIT_SYSTEM_IMPERIAL +from homeassistant.const import CONF_UNIT_SYSTEM_IMPERIAL, CONF_UNIT_SYSTEM_METRIC from homeassistant.helpers import config_validation as cv from homeassistant.util import location diff --git a/homeassistant/components/config/entity_registry.py b/homeassistant/components/config/entity_registry.py index 125b2260f0..458a9dd3ec 100644 --- a/homeassistant/components/config/entity_registry.py +++ b/homeassistant/components/config/entity_registry.py @@ -1,15 +1,15 @@ """HTTP views to interact with the entity registry.""" import voluptuous as vol -from homeassistant.core import callback -from homeassistant.helpers.entity_registry import async_get_registry from homeassistant.components import websocket_api from homeassistant.components.websocket_api.const import ERR_NOT_FOUND from homeassistant.components.websocket_api.decorators import ( async_response, require_admin, ) +from homeassistant.core import callback from homeassistant.helpers import config_validation as cv +from homeassistant.helpers.entity_registry import async_get_registry async def async_setup(hass): diff --git a/homeassistant/components/config/group.py b/homeassistant/components/config/group.py index d104cd2e1d..d95891af65 100644 --- a/homeassistant/components/config/group.py +++ b/homeassistant/components/config/group.py @@ -1,7 +1,7 @@ """Provide configuration end points for Groups.""" from homeassistant.components.group import DOMAIN, GROUP_SCHEMA -from homeassistant.const import SERVICE_RELOAD from homeassistant.config import GROUP_CONFIG_PATH +from homeassistant.const import SERVICE_RELOAD import homeassistant.helpers.config_validation as cv from . import EditKeyBasedConfigView diff --git a/homeassistant/components/config/scene.py b/homeassistant/components/config/scene.py index 6e77dae082..79a30177e4 100644 --- a/homeassistant/components/config/scene.py +++ b/homeassistant/components/config/scene.py @@ -3,8 +3,8 @@ from collections import OrderedDict import uuid from homeassistant.components.scene import DOMAIN, PLATFORM_SCHEMA -from homeassistant.const import CONF_ID, SERVICE_RELOAD from homeassistant.config import SCENE_CONFIG_PATH +from homeassistant.const import CONF_ID, SERVICE_RELOAD import homeassistant.helpers.config_validation as cv from . import EditIdBasedConfigView diff --git a/homeassistant/components/config/script.py b/homeassistant/components/config/script.py index e63651d8f2..032774de47 100644 --- a/homeassistant/components/config/script.py +++ b/homeassistant/components/config/script.py @@ -1,7 +1,7 @@ """Provide configuration end points for scripts.""" from homeassistant.components.script import DOMAIN, SCRIPT_ENTRY_SCHEMA -from homeassistant.const import SERVICE_RELOAD from homeassistant.config import SCRIPT_CONFIG_PATH +from homeassistant.const import SERVICE_RELOAD import homeassistant.helpers.config_validation as cv from . import EditKeyBasedConfigView diff --git a/tests/components/config/test_area_registry.py b/tests/components/config/test_area_registry.py index 0505597c6f..f66e16e606 100644 --- a/tests/components/config/test_area_registry.py +++ b/tests/components/config/test_area_registry.py @@ -2,6 +2,7 @@ import pytest from homeassistant.components.config import area_registry + from tests.common import mock_area_registry diff --git a/tests/components/config/test_auth.py b/tests/components/config/test_auth.py index 4d90f34565..b07df39a8f 100644 --- a/tests/components/config/test_auth.py +++ b/tests/components/config/test_auth.py @@ -4,7 +4,7 @@ import pytest from homeassistant.auth import models as auth_models from homeassistant.components.config import auth as auth_config -from tests.common import MockGroup, MockUser, CLIENT_ID +from tests.common import CLIENT_ID, MockGroup, MockUser @pytest.fixture(autouse=True) diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py index 3d22d3ac1a..6176bd73c5 100644 --- a/tests/components/config/test_config_entries.py +++ b/tests/components/config/test_config_entries.py @@ -8,18 +8,18 @@ import pytest import voluptuous as vol from homeassistant import config_entries as core_ce, data_entry_flow +from homeassistant.components.config import config_entries from homeassistant.config_entries import HANDLERS from homeassistant.core import callback -from homeassistant.setup import async_setup_component -from homeassistant.components.config import config_entries from homeassistant.generated import config_flows +from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, MockModule, mock_coro_func, - mock_integration, mock_entity_platform, + mock_integration, ) diff --git a/tests/components/config/test_core.py b/tests/components/config/test_core.py index 050190d8db..8caa0f3e6f 100644 --- a/tests/components/config/test_core.py +++ b/tests/components/config/test_core.py @@ -8,6 +8,7 @@ from homeassistant.components import config from homeassistant.components.websocket_api.const import TYPE_RESULT from homeassistant.const import CONF_UNIT_SYSTEM, CONF_UNIT_SYSTEM_IMPERIAL from homeassistant.util import dt as dt_util, location + from tests.common import mock_coro ORIG_TIME_ZONE = dt_util.DEFAULT_TIME_ZONE diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py index cd305e5b56..a3710d48b9 100644 --- a/tests/components/config/test_device_registry.py +++ b/tests/components/config/test_device_registry.py @@ -2,6 +2,7 @@ import pytest from homeassistant.components.config import device_registry + from tests.common import mock_device_registry diff --git a/tests/components/config/test_entity_registry.py b/tests/components/config/test_entity_registry.py index 9472d88825..133c88d9ce 100644 --- a/tests/components/config/test_entity_registry.py +++ b/tests/components/config/test_entity_registry.py @@ -3,9 +3,10 @@ from collections import OrderedDict import pytest -from homeassistant.helpers.entity_registry import RegistryEntry from homeassistant.components.config import entity_registry -from tests.common import mock_registry, MockEntity, MockEntityPlatform +from homeassistant.helpers.entity_registry import RegistryEntry + +from tests.common import MockEntity, MockEntityPlatform, mock_registry @pytest.fixture diff --git a/tests/components/config/test_group.py b/tests/components/config/test_group.py index 3240dbe9c1..3a4a145105 100644 --- a/tests/components/config/test_group.py +++ b/tests/components/config/test_group.py @@ -1,12 +1,11 @@ """Test Group config panel.""" import asyncio import json -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch from homeassistant.bootstrap import async_setup_component from homeassistant.components import config - VIEW_NAME = "api:config:group:config" diff --git a/tests/components/config/test_init.py b/tests/components/config/test_init.py index 8e5fab494e..21af45a120 100644 --- a/tests/components/config/test_init.py +++ b/tests/components/config/test_init.py @@ -2,11 +2,11 @@ import asyncio from unittest.mock import patch -from homeassistant.const import EVENT_COMPONENT_LOADED -from homeassistant.setup import async_setup_component, ATTR_COMPONENT from homeassistant.components import config +from homeassistant.const import EVENT_COMPONENT_LOADED +from homeassistant.setup import ATTR_COMPONENT, async_setup_component -from tests.common import mock_coro, mock_component +from tests.common import mock_component, mock_coro @asyncio.coroutine diff --git a/tests/components/config/test_zwave.py b/tests/components/config/test_zwave.py index 9f62c3f9ac..c2490de23e 100644 --- a/tests/components/config/test_zwave.py +++ b/tests/components/config/test_zwave.py @@ -7,10 +7,9 @@ import pytest from homeassistant.bootstrap import async_setup_component from homeassistant.components import config - from homeassistant.components.zwave import DATA_NETWORK, const -from tests.mock.zwave import MockNode, MockValue, MockEntityValues +from tests.mock.zwave import MockEntityValues, MockNode, MockValue VIEW_NAME = "api:config:zwave:device_config"