From 00dc7216093abd099b1e4a58a14876cc9ed2896e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 16:33:22 +0100 Subject: [PATCH] sort imports according to PEP8 for hassio (#29634) --- homeassistant/components/hassio/__init__.py | 4 ++-- homeassistant/components/hassio/addon_panel.py | 2 +- homeassistant/components/hassio/auth.py | 6 +++--- homeassistant/components/hassio/discovery.py | 2 +- homeassistant/components/hassio/http.py | 2 +- homeassistant/components/hassio/ingress.py | 2 +- tests/components/hassio/conftest.py | 7 ++++--- tests/components/hassio/test_addon_panel.py | 2 +- tests/components/hassio/test_auth.py | 2 +- tests/components/hassio/test_discovery.py | 4 ++-- tests/components/hassio/test_init.py | 7 +++---- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py index e0c0a57375a..dab0fadd922 100644 --- a/homeassistant/components/hassio/__init__.py +++ b/homeassistant/components/hassio/__init__.py @@ -10,9 +10,9 @@ from homeassistant.components.homeassistant import SERVICE_CHECK_CONFIG import homeassistant.config as conf_util from homeassistant.const import ( ATTR_NAME, + EVENT_CORE_CONFIG_UPDATE, SERVICE_HOMEASSISTANT_RESTART, SERVICE_HOMEASSISTANT_STOP, - EVENT_CORE_CONFIG_UPDATE, ) from homeassistant.core import DOMAIN as HASS_DOMAIN, callback from homeassistant.exceptions import HomeAssistantError @@ -20,8 +20,8 @@ import homeassistant.helpers.config_validation as cv from homeassistant.loader import bind_hass from homeassistant.util.dt import utcnow -from .auth import async_setup_auth_view from .addon_panel import async_setup_addon_panel +from .auth import async_setup_auth_view from .discovery import async_setup_discovery_view from .handler import HassIO, HassioAPIError from .http import HassIOView diff --git a/homeassistant/components/hassio/addon_panel.py b/homeassistant/components/hassio/addon_panel.py index b60c864a893..cb509cb19a1 100644 --- a/homeassistant/components/hassio/addon_panel.py +++ b/homeassistant/components/hassio/addon_panel.py @@ -7,7 +7,7 @@ from aiohttp import web from homeassistant.components.http import HomeAssistantView from homeassistant.helpers.typing import HomeAssistantType -from .const import ATTR_PANELS, ATTR_TITLE, ATTR_ICON, ATTR_ADMIN, ATTR_ENABLE +from .const import ATTR_ADMIN, ATTR_ENABLE, ATTR_ICON, ATTR_PANELS, ATTR_TITLE from .handler import HassioAPIError _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/hassio/auth.py b/homeassistant/components/hassio/auth.py index 19e4c63b5a5..800801b4350 100644 --- a/homeassistant/components/hassio/auth.py +++ b/homeassistant/components/hassio/auth.py @@ -1,18 +1,18 @@ """Implement the auth feature from Hass.io for Add-ons.""" +from ipaddress import ip_address import logging import os -from ipaddress import ip_address -import voluptuous as vol from aiohttp import web from aiohttp.web_exceptions import HTTPForbidden, HTTPNotFound +import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.http import HomeAssistantView from homeassistant.components.http.const import KEY_REAL_IP from homeassistant.components.http.data_validator import RequestDataValidator from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.typing import HomeAssistantType from .const import ATTR_ADDON, ATTR_PASSWORD, ATTR_USERNAME diff --git a/homeassistant/components/hassio/discovery.py b/homeassistant/components/hassio/discovery.py index 55336735133..fc6efbe0e58 100644 --- a/homeassistant/components/hassio/discovery.py +++ b/homeassistant/components/hassio/discovery.py @@ -5,9 +5,9 @@ import logging from aiohttp import web from aiohttp.web_exceptions import HTTPServiceUnavailable +from homeassistant.components.http import HomeAssistantView from homeassistant.const import EVENT_HOMEASSISTANT_START from homeassistant.core import callback -from homeassistant.components.http import HomeAssistantView from .const import ( ATTR_ADDON, diff --git a/homeassistant/components/hassio/http.py b/homeassistant/components/hassio/http.py index 3b1b8374510..ddb9269219b 100644 --- a/homeassistant/components/hassio/http.py +++ b/homeassistant/components/hassio/http.py @@ -7,7 +7,7 @@ from typing import Dict, Union import aiohttp from aiohttp import web -from aiohttp.hdrs import CONTENT_TYPE, CONTENT_LENGTH +from aiohttp.hdrs import CONTENT_LENGTH, CONTENT_TYPE from aiohttp.web_exceptions import HTTPBadGateway import async_timeout diff --git a/homeassistant/components/hassio/ingress.py b/homeassistant/components/hassio/ingress.py index 53235f80dca..c69d2078468 100644 --- a/homeassistant/components/hassio/ingress.py +++ b/homeassistant/components/hassio/ingress.py @@ -1,8 +1,8 @@ """Hass.io Add-on ingress service.""" import asyncio +from ipaddress import ip_address import logging import os -from ipaddress import ip_address from typing import Dict, Union import aiohttp diff --git a/tests/components/hassio/conftest.py b/tests/components/hassio/conftest.py index 0e246cf1b46..d7ef853012e 100644 --- a/tests/components/hassio/conftest.py +++ b/tests/components/hassio/conftest.py @@ -1,15 +1,16 @@ """Fixtures for Hass.io.""" import os -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch import pytest +from homeassistant.components.hassio.handler import HassIO, HassioAPIError from homeassistant.core import CoreState from homeassistant.setup import async_setup_component -from homeassistant.components.hassio.handler import HassIO, HassioAPIError + +from . import HASSIO_TOKEN from tests.common import mock_coro -from . import HASSIO_TOKEN @pytest.fixture diff --git a/tests/components/hassio/test_addon_panel.py b/tests/components/hassio/test_addon_panel.py index 480df508968..d2ad673111d 100644 --- a/tests/components/hassio/test_addon_panel.py +++ b/tests/components/hassio/test_addon_panel.py @@ -1,5 +1,5 @@ """Test add-on panel.""" -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch import pytest diff --git a/tests/components/hassio/test_auth.py b/tests/components/hassio/test_auth.py index 1fb6d32ccf7..c7fe3459e41 100644 --- a/tests/components/hassio/test_auth.py +++ b/tests/components/hassio/test_auth.py @@ -1,5 +1,5 @@ """The tests for the hassio component.""" -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch from homeassistant.exceptions import HomeAssistantError diff --git a/tests/components/hassio/test_discovery.py b/tests/components/hassio/test_discovery.py index a1b4ae2e900..2a2fdc4deaa 100644 --- a/tests/components/hassio/test_discovery.py +++ b/tests/components/hassio/test_discovery.py @@ -1,9 +1,9 @@ """Test config flow.""" -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch -from homeassistant.setup import async_setup_component from homeassistant.components.hassio.handler import HassioAPIError from homeassistant.const import EVENT_HOMEASSISTANT_START +from homeassistant.setup import async_setup_component from tests.common import mock_coro diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py index 3d27931896f..c1e3d7ab2bf 100644 --- a/tests/components/hassio/test_init.py +++ b/tests/components/hassio/test_init.py @@ -1,18 +1,17 @@ """The tests for the hassio component.""" import asyncio import os -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch import pytest from homeassistant.auth.const import GROUP_ID_ADMIN -from homeassistant.setup import async_setup_component -from homeassistant.components.hassio import STORAGE_KEY from homeassistant.components import frontend +from homeassistant.components.hassio import STORAGE_KEY +from homeassistant.setup import async_setup_component from tests.common import mock_coro - MOCK_ENVIRON = {"HASSIO": "127.0.0.1", "HASSIO_TOKEN": "abcdefgh"}