From d3f67c3841a586eefe8b69beb85e4a3f6f1755bf Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 17:29:39 +0100 Subject: [PATCH] use isort to sort imports according to PEP8 for automation (#29620) --- homeassistant/components/automation/__init__.py | 3 +-- homeassistant/components/automation/config.py | 2 +- homeassistant/components/automation/device.py | 1 - homeassistant/components/automation/event.py | 3 +-- .../components/automation/geo_location.py | 3 +-- .../components/automation/homeassistant.py | 5 ++--- homeassistant/components/automation/litejet.py | 5 ++--- homeassistant/components/automation/mqtt.py | 5 ++--- .../components/automation/numeric_state.py | 13 ++++++------- .../components/automation/reproduce_state.py | 4 ++-- homeassistant/components/automation/state.py | 7 +++---- homeassistant/components/automation/sun.py | 5 ++--- homeassistant/components/automation/template.py | 8 +++----- homeassistant/components/automation/time.py | 3 +-- .../components/automation/time_pattern.py | 3 +-- homeassistant/components/automation/webhook.py | 3 +-- homeassistant/components/automation/zone.py | 9 ++++----- tests/components/automation/common.py | 8 ++++---- tests/components/automation/test_event.py | 5 ++--- tests/components/automation/test_geo_location.py | 3 +-- tests/components/automation/test_homeassistant.py | 4 ++-- tests/components/automation/test_litejet.py | 5 +++-- tests/components/automation/test_mqtt.py | 10 ++++++---- tests/components/automation/test_numeric_state.py | 7 ++++--- tests/components/automation/test_state.py | 14 +++++++++----- tests/components/automation/test_sun.py | 10 +++++----- tests/components/automation/test_template.py | 10 +++++++--- tests/components/automation/test_time.py | 10 +++++++--- tests/components/automation/test_time_pattern.py | 5 ++--- tests/components/automation/test_zone.py | 4 ++-- 30 files changed, 87 insertions(+), 90 deletions(-) diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py index 2b775e3a602..4441b028565 100644 --- a/homeassistant/components/automation/__init__.py +++ b/homeassistant/components/automation/__init__.py @@ -27,13 +27,12 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.config_validation import make_entity_service_schema from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.entity_component import EntityComponent -from homeassistant.helpers.service import async_register_admin_service from homeassistant.helpers.restore_state import RestoreEntity +from homeassistant.helpers.service import async_register_admin_service from homeassistant.helpers.typing import TemplateVarsType from homeassistant.loader import bind_hass from homeassistant.util.dt import parse_datetime, utcnow - # mypy: allow-untyped-calls, allow-untyped-defs # mypy: no-check-untyped-defs, no-warn-return-any diff --git a/homeassistant/components/automation/config.py b/homeassistant/components/automation/config.py index 5733cd2e83e..d11472a2128 100644 --- a/homeassistant/components/automation/config.py +++ b/homeassistant/components/automation/config.py @@ -7,8 +7,8 @@ import voluptuous as vol from homeassistant.components.device_automation.exceptions import ( InvalidDeviceAutomationConfig, ) -from homeassistant.const import CONF_PLATFORM from homeassistant.config import async_log_exception, config_without_domain +from homeassistant.const import CONF_PLATFORM from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import condition, config_per_platform, script from homeassistant.loader import IntegrationNotFound diff --git a/homeassistant/components/automation/device.py b/homeassistant/components/automation/device.py index ced8f65cbf5..b2892d1abaa 100644 --- a/homeassistant/components/automation/device.py +++ b/homeassistant/components/automation/device.py @@ -7,7 +7,6 @@ from homeassistant.components.device_automation import ( ) from homeassistant.const import CONF_DOMAIN - # mypy: allow-untyped-defs, no-check-untyped-defs TRIGGER_SCHEMA = TRIGGER_BASE_SCHEMA.extend({}, extra=vol.ALLOW_EXTRA) diff --git a/homeassistant/components/automation/event.py b/homeassistant/components/automation/event.py index 26dacac974d..9fc78746a7c 100644 --- a/homeassistant/components/automation/event.py +++ b/homeassistant/components/automation/event.py @@ -3,11 +3,10 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import CONF_PLATFORM +from homeassistant.core import callback from homeassistant.helpers import config_validation as cv - # mypy: allow-untyped-defs CONF_EVENT_TYPE = "event_type" diff --git a/homeassistant/components/automation/geo_location.py b/homeassistant/components/automation/geo_location.py index 0ef0884d329..5dc4f3c80f6 100644 --- a/homeassistant/components/automation/geo_location.py +++ b/homeassistant/components/automation/geo_location.py @@ -2,7 +2,6 @@ import voluptuous as vol from homeassistant.components.geo_location import DOMAIN -from homeassistant.core import callback from homeassistant.const import ( CONF_EVENT, CONF_PLATFORM, @@ -10,10 +9,10 @@ from homeassistant.const import ( CONF_ZONE, EVENT_STATE_CHANGED, ) +from homeassistant.core import callback from homeassistant.helpers import condition, config_validation as cv from homeassistant.helpers.config_validation import entity_domain - # mypy: allow-untyped-defs, no-check-untyped-defs EVENT_ENTER = "enter" diff --git a/homeassistant/components/automation/homeassistant.py b/homeassistant/components/automation/homeassistant.py index e4eb029d5aa..743b169c86c 100644 --- a/homeassistant/components/automation/homeassistant.py +++ b/homeassistant/components/automation/homeassistant.py @@ -3,9 +3,8 @@ import logging import voluptuous as vol -from homeassistant.core import callback, CoreState -from homeassistant.const import CONF_PLATFORM, CONF_EVENT, EVENT_HOMEASSISTANT_STOP - +from homeassistant.const import CONF_EVENT, CONF_PLATFORM, EVENT_HOMEASSISTANT_STOP +from homeassistant.core import CoreState, callback # mypy: allow-untyped-defs diff --git a/homeassistant/components/automation/litejet.py b/homeassistant/components/automation/litejet.py index 9512db8261d..466fc941a9a 100644 --- a/homeassistant/components/automation/litejet.py +++ b/homeassistant/components/automation/litejet.py @@ -3,12 +3,11 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import CONF_PLATFORM +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv -import homeassistant.util.dt as dt_util from homeassistant.helpers.event import track_point_in_utc_time - +import homeassistant.util.dt as dt_util # mypy: allow-untyped-defs, no-check-untyped-defs diff --git a/homeassistant/components/automation/mqtt.py b/homeassistant/components/automation/mqtt.py index 135a421f72e..fb0073c78d5 100644 --- a/homeassistant/components/automation/mqtt.py +++ b/homeassistant/components/automation/mqtt.py @@ -3,12 +3,11 @@ import json import voluptuous as vol -from homeassistant.core import callback from homeassistant.components import mqtt -from homeassistant.const import CONF_PLATFORM, CONF_PAYLOAD +from homeassistant.const import CONF_PAYLOAD, CONF_PLATFORM +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv - # mypy: allow-untyped-defs CONF_ENCODING = "encoding" diff --git a/homeassistant/components/automation/numeric_state.py b/homeassistant/components/automation/numeric_state.py index 0c8ab3d9c8b..e944b66751b 100644 --- a/homeassistant/components/automation/numeric_state.py +++ b/homeassistant/components/automation/numeric_state.py @@ -4,18 +4,17 @@ import logging import voluptuous as vol from homeassistant import exceptions -from homeassistant.core import CALLBACK_TYPE, callback from homeassistant.const import ( - CONF_VALUE_TEMPLATE, - CONF_PLATFORM, - CONF_ENTITY_ID, - CONF_BELOW, CONF_ABOVE, + CONF_BELOW, + CONF_ENTITY_ID, CONF_FOR, + CONF_PLATFORM, + CONF_VALUE_TEMPLATE, ) -from homeassistant.helpers.event import async_track_state_change, async_track_same_state +from homeassistant.core import CALLBACK_TYPE, callback from homeassistant.helpers import condition, config_validation as cv, template - +from homeassistant.helpers.event import async_track_same_state, async_track_state_change # mypy: allow-incomplete-defs, allow-untyped-calls, allow-untyped-defs # mypy: no-check-untyped-defs diff --git a/homeassistant/components/automation/reproduce_state.py b/homeassistant/components/automation/reproduce_state.py index 553d6871087..4cfe519d585 100644 --- a/homeassistant/components/automation/reproduce_state.py +++ b/homeassistant/components/automation/reproduce_state.py @@ -5,10 +5,10 @@ from typing import Iterable, Optional from homeassistant.const import ( ATTR_ENTITY_ID, - STATE_ON, - STATE_OFF, SERVICE_TURN_OFF, SERVICE_TURN_ON, + STATE_OFF, + STATE_ON, ) from homeassistant.core import Context, State from homeassistant.helpers.typing import HomeAssistantType diff --git a/homeassistant/components/automation/state.py b/homeassistant/components/automation/state.py index 47c44587b08..fc3fff47514 100644 --- a/homeassistant/components/automation/state.py +++ b/homeassistant/components/automation/state.py @@ -6,11 +6,10 @@ from typing import Dict import voluptuous as vol from homeassistant import exceptions -from homeassistant.core import HomeAssistant, CALLBACK_TYPE, callback -from homeassistant.const import MATCH_ALL, CONF_PLATFORM, CONF_FOR +from homeassistant.const import CONF_FOR, CONF_PLATFORM, MATCH_ALL +from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback from homeassistant.helpers import config_validation as cv, template -from homeassistant.helpers.event import async_track_state_change, async_track_same_state - +from homeassistant.helpers.event import async_track_same_state, async_track_state_change # mypy: allow-incomplete-defs, allow-untyped-calls, allow-untyped-defs # mypy: no-check-untyped-defs diff --git a/homeassistant/components/automation/sun.py b/homeassistant/components/automation/sun.py index 66892784a54..c416742f397 100644 --- a/homeassistant/components/automation/sun.py +++ b/homeassistant/components/automation/sun.py @@ -4,16 +4,15 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import ( CONF_EVENT, CONF_OFFSET, CONF_PLATFORM, SUN_EVENT_SUNRISE, ) -from homeassistant.helpers.event import async_track_sunrise, async_track_sunset +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv - +from homeassistant.helpers.event import async_track_sunrise, async_track_sunset # mypy: allow-untyped-defs, no-check-untyped-defs diff --git a/homeassistant/components/automation/template.py b/homeassistant/components/automation/template.py index 95b6b857c9d..ee4484410cd 100644 --- a/homeassistant/components/automation/template.py +++ b/homeassistant/components/automation/template.py @@ -3,13 +3,11 @@ import logging import voluptuous as vol -from homeassistant.core import callback -from homeassistant.const import CONF_VALUE_TEMPLATE, CONF_PLATFORM, CONF_FOR from homeassistant import exceptions -from homeassistant.helpers import condition +from homeassistant.const import CONF_FOR, CONF_PLATFORM, CONF_VALUE_TEMPLATE +from homeassistant.core import callback +from homeassistant.helpers import condition, config_validation as cv, template from homeassistant.helpers.event import async_track_same_state, async_track_template -from homeassistant.helpers import config_validation as cv, template - # mypy: allow-untyped-defs, no-check-untyped-defs diff --git a/homeassistant/components/automation/time.py b/homeassistant/components/automation/time.py index 231bc346e14..5f461952960 100644 --- a/homeassistant/components/automation/time.py +++ b/homeassistant/components/automation/time.py @@ -3,12 +3,11 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import CONF_AT, CONF_PLATFORM +from homeassistant.core import callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.event import async_track_time_change - # mypy: allow-untyped-defs, no-check-untyped-defs _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/automation/time_pattern.py b/homeassistant/components/automation/time_pattern.py index ee092916112..65d44f5b1ca 100644 --- a/homeassistant/components/automation/time_pattern.py +++ b/homeassistant/components/automation/time_pattern.py @@ -3,12 +3,11 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import CONF_PLATFORM +from homeassistant.core import callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.event import async_track_time_change - # mypy: allow-untyped-defs, no-check-untyped-defs CONF_HOURS = "hours" diff --git a/homeassistant/components/automation/webhook.py b/homeassistant/components/automation/webhook.py index bbcf9bd9ddc..5d01c6454a8 100644 --- a/homeassistant/components/automation/webhook.py +++ b/homeassistant/components/automation/webhook.py @@ -5,13 +5,12 @@ import logging from aiohttp import hdrs import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import CONF_PLATFORM, CONF_WEBHOOK_ID +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from . import DOMAIN as AUTOMATION_DOMAIN - # mypy: allow-untyped-defs DEPENDENCIES = ("webhook",) diff --git a/homeassistant/components/automation/zone.py b/homeassistant/components/automation/zone.py index 535ef298a2a..3dba1a4df35 100644 --- a/homeassistant/components/automation/zone.py +++ b/homeassistant/components/automation/zone.py @@ -1,17 +1,16 @@ """Offer zone automation rules.""" import voluptuous as vol -from homeassistant.core import callback from homeassistant.const import ( - CONF_EVENT, CONF_ENTITY_ID, + CONF_EVENT, + CONF_PLATFORM, CONF_ZONE, MATCH_ALL, - CONF_PLATFORM, ) -from homeassistant.helpers.event import async_track_state_change +from homeassistant.core import callback from homeassistant.helpers import condition, config_validation as cv, location - +from homeassistant.helpers.event import async_track_state_change # mypy: allow-untyped-defs, no-check-untyped-defs diff --git a/tests/components/automation/common.py b/tests/components/automation/common.py index 729a6bb7212..95b156bcb14 100644 --- a/tests/components/automation/common.py +++ b/tests/components/automation/common.py @@ -6,11 +6,11 @@ components. Instead call the service directly. from homeassistant.components.automation import DOMAIN, SERVICE_TRIGGER from homeassistant.const import ( ATTR_ENTITY_ID, - SERVICE_TURN_ON, - SERVICE_TURN_OFF, - SERVICE_TOGGLE, - SERVICE_RELOAD, ENTITY_MATCH_ALL, + SERVICE_RELOAD, + SERVICE_TOGGLE, + SERVICE_TURN_OFF, + SERVICE_TURN_ON, ) from homeassistant.loader import bind_hass diff --git a/tests/components/automation/test_event.py b/tests/components/automation/test_event.py index e8d6089f500..26d19d6fa47 100644 --- a/tests/components/automation/test_event.py +++ b/tests/components/automation/test_event.py @@ -1,13 +1,12 @@ """The tests for the Event automation.""" import pytest +import homeassistant.components.automation as automation from homeassistant.core import Context from homeassistant.setup import async_setup_component -import homeassistant.components.automation as automation -from tests.common import mock_component +from tests.common import async_mock_service, mock_component from tests.components.automation import common -from tests.common import async_mock_service @pytest.fixture diff --git a/tests/components/automation/test_geo_location.py b/tests/components/automation/test_geo_location.py index d1ded8da1c6..05e30458ef3 100644 --- a/tests/components/automation/test_geo_location.py +++ b/tests/components/automation/test_geo_location.py @@ -5,9 +5,8 @@ from homeassistant.components import automation, zone from homeassistant.core import Context from homeassistant.setup import async_setup_component -from tests.common import mock_component +from tests.common import async_mock_service, mock_component from tests.components.automation import common -from tests.common import async_mock_service @pytest.fixture diff --git a/tests/components/automation/test_homeassistant.py b/tests/components/automation/test_homeassistant.py index 003e900babc..d5bd4c6dd5b 100644 --- a/tests/components/automation/test_homeassistant.py +++ b/tests/components/automation/test_homeassistant.py @@ -1,9 +1,9 @@ """The tests for the Event automation.""" -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch +import homeassistant.components.automation as automation from homeassistant.core import CoreState from homeassistant.setup import async_setup_component -import homeassistant.components.automation as automation from tests.common import async_mock_service, mock_coro diff --git a/tests/components/automation/test_litejet.py b/tests/components/automation/test_litejet.py index 4c916d8ed96..75fbc03a589 100644 --- a/tests/components/automation/test_litejet.py +++ b/tests/components/automation/test_litejet.py @@ -1,13 +1,14 @@ """The tests for the litejet component.""" +from datetime import timedelta import logging from unittest import mock -from datetime import timedelta + import pytest from homeassistant import setup -import homeassistant.util.dt as dt_util from homeassistant.components import litejet import homeassistant.components.automation as automation +import homeassistant.util.dt as dt_util from tests.common import async_fire_time_changed, async_mock_service diff --git a/tests/components/automation/test_mqtt.py b/tests/components/automation/test_mqtt.py index 7c6db978f5c..9dbe93a7998 100644 --- a/tests/components/automation/test_mqtt.py +++ b/tests/components/automation/test_mqtt.py @@ -1,14 +1,16 @@ """The tests for the MQTT automation.""" -import pytest from unittest import mock -from homeassistant.setup import async_setup_component +import pytest + import homeassistant.components.automation as automation +from homeassistant.setup import async_setup_component + from tests.common import ( async_fire_mqtt_message, - mock_component, - async_mock_service, async_mock_mqtt_component, + async_mock_service, + mock_component, ) from tests.components.automation import common diff --git a/tests/components/automation/test_numeric_state.py b/tests/components/automation/test_numeric_state.py index 3cb8e2588fc..c6c1fd83184 100644 --- a/tests/components/automation/test_numeric_state.py +++ b/tests/components/automation/test_numeric_state.py @@ -1,18 +1,19 @@ """The tests for numeric state automation.""" from datetime import timedelta -import pytest from unittest.mock import patch +import pytest + import homeassistant.components.automation as automation from homeassistant.core import Context from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from tests.common import ( - mock_component, - async_fire_time_changed, assert_setup_component, + async_fire_time_changed, async_mock_service, + mock_component, ) from tests.components.automation import common diff --git a/tests/components/automation/test_state.py b/tests/components/automation/test_state.py index 9d84fb3e8ce..b6f9a50cf9d 100644 --- a/tests/components/automation/test_state.py +++ b/tests/components/automation/test_state.py @@ -1,17 +1,21 @@ """The test for state automation.""" from datetime import timedelta - -import pytest from unittest.mock import patch +import pytest + +import homeassistant.components.automation as automation from homeassistant.core import Context from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -import homeassistant.components.automation as automation -from tests.common import async_fire_time_changed, assert_setup_component, mock_component +from tests.common import ( + assert_setup_component, + async_fire_time_changed, + async_mock_service, + mock_component, +) from tests.components.automation import common -from tests.common import async_mock_service @pytest.fixture diff --git a/tests/components/automation/test_sun.py b/tests/components/automation/test_sun.py index 2668ac97053..3468c9e9480 100644 --- a/tests/components/automation/test_sun.py +++ b/tests/components/automation/test_sun.py @@ -1,16 +1,16 @@ """The tests for the sun automation.""" from datetime import datetime - -import pytest from unittest.mock import patch -from homeassistant.const import SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET -from homeassistant.setup import async_setup_component +import pytest + from homeassistant.components import sun import homeassistant.components.automation as automation +from homeassistant.const import SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET +from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.common import async_fire_time_changed, mock_component, async_mock_service +from tests.common import async_fire_time_changed, async_mock_service, mock_component from tests.components.automation import common ORIG_TIME_ZONE = dt_util.DEFAULT_TIME_ZONE diff --git a/tests/components/automation/test_template.py b/tests/components/automation/test_template.py index d7726b7ffd8..d9566b8f464 100644 --- a/tests/components/automation/test_template.py +++ b/tests/components/automation/test_template.py @@ -4,14 +4,18 @@ from unittest import mock import pytest +import homeassistant.components.automation as automation from homeassistant.core import Context from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -import homeassistant.components.automation as automation -from tests.common import async_fire_time_changed, assert_setup_component, mock_component +from tests.common import ( + assert_setup_component, + async_fire_time_changed, + async_mock_service, + mock_component, +) from tests.components.automation import common -from tests.common import async_mock_service @pytest.fixture diff --git a/tests/components/automation/test_time.py b/tests/components/automation/test_time.py index fa931d06bfc..e12ce6684d2 100644 --- a/tests/components/automation/test_time.py +++ b/tests/components/automation/test_time.py @@ -4,12 +4,16 @@ from unittest.mock import patch import pytest +import homeassistant.components.automation as automation from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -import homeassistant.components.automation as automation -from tests.common import async_fire_time_changed, assert_setup_component, mock_component -from tests.common import async_mock_service +from tests.common import ( + assert_setup_component, + async_fire_time_changed, + async_mock_service, + mock_component, +) @pytest.fixture diff --git a/tests/components/automation/test_time_pattern.py b/tests/components/automation/test_time_pattern.py index 479bab1c78e..70d647a1241 100644 --- a/tests/components/automation/test_time_pattern.py +++ b/tests/components/automation/test_time_pattern.py @@ -1,13 +1,12 @@ """The tests for the time_pattern automation.""" import pytest +import homeassistant.components.automation as automation from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -import homeassistant.components.automation as automation -from tests.common import async_fire_time_changed, mock_component +from tests.common import async_fire_time_changed, async_mock_service, mock_component from tests.components.automation import common -from tests.common import async_mock_service @pytest.fixture diff --git a/tests/components/automation/test_zone.py b/tests/components/automation/test_zone.py index 07be09a8454..44ad20e16f0 100644 --- a/tests/components/automation/test_zone.py +++ b/tests/components/automation/test_zone.py @@ -1,12 +1,12 @@ """The tests for the location automation.""" import pytest +from homeassistant.components import automation, zone from homeassistant.core import Context from homeassistant.setup import async_setup_component -from homeassistant.components import automation, zone -from tests.components.automation import common from tests.common import async_mock_service, mock_component +from tests.components.automation import common @pytest.fixture