From 954813b47832ab91d9dc400862769abef3817b3e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 17:55:01 +0100 Subject: [PATCH] use isort to sort imports according to PEP8 for climate (#29625) --- homeassistant/components/climate/__init__.py | 4 +-- .../components/climate/device_action.py | 10 +++--- .../components/climate/device_condition.py | 8 +++-- .../components/climate/device_trigger.py | 32 ++++++++++--------- .../components/climate/reproduce_state.py | 18 +++++------ tests/components/climate/common.py | 2 +- .../components/climate/test_device_action.py | 8 ++--- .../climate/test_device_condition.py | 8 ++--- .../components/climate/test_device_trigger.py | 10 +++--- tests/components/climate/test_init.py | 7 ++-- .../climate/test_reproduce_state.py | 2 +- 11 files changed, 58 insertions(+), 51 deletions(-) diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py index 6006b2a9a3b..e2bf555cc49 100644 --- a/homeassistant/components/climate/__init__.py +++ b/homeassistant/components/climate/__init__.py @@ -19,9 +19,9 @@ from homeassistant.const import ( ) import homeassistant.helpers.config_validation as cv from homeassistant.helpers.config_validation import ( # noqa: F401 - make_entity_service_schema, PLATFORM_SCHEMA, PLATFORM_SCHEMA_BASE, + make_entity_service_schema, ) from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity_component import EntityComponent @@ -68,8 +68,8 @@ from .const import ( SUPPORT_PRESET_MODE, SUPPORT_SWING_MODE, SUPPORT_TARGET_HUMIDITY, - SUPPORT_TARGET_TEMPERATURE_RANGE, SUPPORT_TARGET_TEMPERATURE, + SUPPORT_TARGET_TEMPERATURE_RANGE, ) DEFAULT_MIN_TEMP = 7 diff --git a/homeassistant/components/climate/device_action.py b/homeassistant/components/climate/device_action.py index 836e2277461..6f7725ac835 100644 --- a/homeassistant/components/climate/device_action.py +++ b/homeassistant/components/climate/device_action.py @@ -1,17 +1,19 @@ """Provides device automations for Climate.""" -from typing import Optional, List +from typing import List, Optional + import voluptuous as vol from homeassistant.const import ( ATTR_ENTITY_ID, - CONF_DOMAIN, - CONF_TYPE, CONF_DEVICE_ID, + CONF_DOMAIN, CONF_ENTITY_ID, + CONF_TYPE, ) -from homeassistant.core import HomeAssistant, Context +from homeassistant.core import Context, HomeAssistant from homeassistant.helpers import entity_registry import homeassistant.helpers.config_validation as cv + from . import DOMAIN, const ACTION_TYPES = {"set_hvac_mode", "set_preset_mode"} diff --git a/homeassistant/components/climate/device_condition.py b/homeassistant/components/climate/device_condition.py index 3a075233942..cf393a035ec 100644 --- a/homeassistant/components/climate/device_condition.py +++ b/homeassistant/components/climate/device_condition.py @@ -1,19 +1,21 @@ """Provide the device automations for Climate.""" from typing import Dict, List + import voluptuous as vol from homeassistant.const import ( ATTR_ENTITY_ID, CONF_CONDITION, - CONF_DOMAIN, - CONF_TYPE, CONF_DEVICE_ID, + CONF_DOMAIN, CONF_ENTITY_ID, + CONF_TYPE, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import condition, config_validation as cv, entity_registry -from homeassistant.helpers.typing import ConfigType, TemplateVarsType from homeassistant.helpers.config_validation import DEVICE_CONDITION_BASE_SCHEMA +from homeassistant.helpers.typing import ConfigType, TemplateVarsType + from . import DOMAIN, const CONDITION_TYPES = {"is_hvac_mode", "is_preset_mode"} diff --git a/homeassistant/components/climate/device_trigger.py b/homeassistant/components/climate/device_trigger.py index e814bdc88de..4c5dcb0ee04 100644 --- a/homeassistant/components/climate/device_trigger.py +++ b/homeassistant/components/climate/device_trigger.py @@ -1,26 +1,28 @@ """Provides device automations for Climate.""" from typing import List + import voluptuous as vol -from homeassistant.const import ( - CONF_DOMAIN, - CONF_TYPE, - CONF_PLATFORM, - CONF_DEVICE_ID, - CONF_ENTITY_ID, - CONF_FOR, - CONF_ABOVE, - CONF_BELOW, -) -from homeassistant.core import HomeAssistant, CALLBACK_TYPE -from homeassistant.helpers import config_validation as cv, entity_registry -from homeassistant.helpers.typing import ConfigType from homeassistant.components.automation import ( - state as state_automation, - numeric_state as numeric_state_automation, AutomationActionType, + numeric_state as numeric_state_automation, + state as state_automation, ) from homeassistant.components.device_automation import TRIGGER_BASE_SCHEMA +from homeassistant.const import ( + CONF_ABOVE, + CONF_BELOW, + CONF_DEVICE_ID, + CONF_DOMAIN, + CONF_ENTITY_ID, + CONF_FOR, + CONF_PLATFORM, + CONF_TYPE, +) +from homeassistant.core import CALLBACK_TYPE, HomeAssistant +from homeassistant.helpers import config_validation as cv, entity_registry +from homeassistant.helpers.typing import ConfigType + from . import DOMAIN, const TRIGGER_TYPES = { diff --git a/homeassistant/components/climate/reproduce_state.py b/homeassistant/components/climate/reproduce_state.py index 34e72a27c92..82ca4f4e85c 100644 --- a/homeassistant/components/climate/reproduce_state.py +++ b/homeassistant/components/climate/reproduce_state.py @@ -8,20 +8,20 @@ from homeassistant.helpers.typing import HomeAssistantType from .const import ( ATTR_AUX_HEAT, + ATTR_HUMIDITY, + ATTR_HVAC_MODE, + ATTR_PRESET_MODE, + ATTR_SWING_MODE, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, - ATTR_PRESET_MODE, - ATTR_HVAC_MODE, - ATTR_SWING_MODE, - ATTR_HUMIDITY, + DOMAIN, HVAC_MODES, SERVICE_SET_AUX_HEAT, - SERVICE_SET_TEMPERATURE, - SERVICE_SET_PRESET_MODE, - SERVICE_SET_HVAC_MODE, - SERVICE_SET_SWING_MODE, SERVICE_SET_HUMIDITY, - DOMAIN, + SERVICE_SET_HVAC_MODE, + SERVICE_SET_PRESET_MODE, + SERVICE_SET_SWING_MODE, + SERVICE_SET_TEMPERATURE, ) diff --git a/tests/components/climate/common.py b/tests/components/climate/common.py index a5ea182f2b6..5b75dc98e69 100644 --- a/tests/components/climate/common.py +++ b/tests/components/climate/common.py @@ -25,9 +25,9 @@ from homeassistant.components.climate.const import ( from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_TEMPERATURE, + ENTITY_MATCH_ALL, SERVICE_TURN_OFF, SERVICE_TURN_ON, - ENTITY_MATCH_ALL, ) from homeassistant.loader import bind_hass diff --git a/tests/components/climate/test_device_action.py b/tests/components/climate/test_device_action.py index 46e8b3395c4..ff78b837591 100644 --- a/tests/components/climate/test_device_action.py +++ b/tests/components/climate/test_device_action.py @@ -2,18 +2,18 @@ import pytest import voluptuous_serialize -from homeassistant.components.climate import DOMAIN, const, device_action -from homeassistant.setup import async_setup_component import homeassistant.components.automation as automation -from homeassistant.helpers import device_registry, config_validation as cv +from homeassistant.components.climate import DOMAIN, const, device_action +from homeassistant.helpers import config_validation as cv, device_registry +from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, assert_lists_same, + async_get_device_automations, async_mock_service, mock_device_registry, mock_registry, - async_get_device_automations, ) diff --git a/tests/components/climate/test_device_condition.py b/tests/components/climate/test_device_condition.py index b0a9c6c283a..c8aaf0e1967 100644 --- a/tests/components/climate/test_device_condition.py +++ b/tests/components/climate/test_device_condition.py @@ -2,18 +2,18 @@ import pytest import voluptuous_serialize -from homeassistant.components.climate import DOMAIN, const, device_condition -from homeassistant.setup import async_setup_component import homeassistant.components.automation as automation -from homeassistant.helpers import device_registry, config_validation as cv +from homeassistant.components.climate import DOMAIN, const, device_condition +from homeassistant.helpers import config_validation as cv, device_registry +from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, assert_lists_same, + async_get_device_automations, async_mock_service, mock_device_registry, mock_registry, - async_get_device_automations, ) diff --git a/tests/components/climate/test_device_trigger.py b/tests/components/climate/test_device_trigger.py index 3b497912c52..d9bfd6d5ba4 100644 --- a/tests/components/climate/test_device_trigger.py +++ b/tests/components/climate/test_device_trigger.py @@ -1,19 +1,19 @@ """The tests for Climate device triggers.""" -import voluptuous_serialize import pytest +import voluptuous_serialize -from homeassistant.components.climate import DOMAIN, const, device_trigger -from homeassistant.setup import async_setup_component import homeassistant.components.automation as automation -from homeassistant.helpers import device_registry, config_validation as cv +from homeassistant.components.climate import DOMAIN, const, device_trigger +from homeassistant.helpers import config_validation as cv, device_registry +from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, assert_lists_same, + async_get_device_automations, async_mock_service, mock_device_registry, mock_registry, - async_get_device_automations, ) diff --git a/tests/components/climate/test_init.py b/tests/components/climate/test_init.py index b044753c891..4345ecedcf7 100644 --- a/tests/components/climate/test_init.py +++ b/tests/components/climate/test_init.py @@ -1,16 +1,17 @@ """The tests for the climate component.""" -from unittest.mock import MagicMock from typing import List +from unittest.mock import MagicMock import pytest import voluptuous as vol from homeassistant.components.climate import ( - SET_TEMPERATURE_SCHEMA, - ClimateDevice, HVAC_MODE_HEAT, HVAC_MODE_OFF, + SET_TEMPERATURE_SCHEMA, + ClimateDevice, ) + from tests.common import async_mock_service diff --git a/tests/components/climate/test_reproduce_state.py b/tests/components/climate/test_reproduce_state.py index fe995868840..df0b6314d63 100644 --- a/tests/components/climate/test_reproduce_state.py +++ b/tests/components/climate/test_reproduce_state.py @@ -2,7 +2,6 @@ import pytest -from homeassistant.components.climate.reproduce_state import async_reproduce_states from homeassistant.components.climate.const import ( ATTR_AUX_HEAT, ATTR_HUMIDITY, @@ -21,6 +20,7 @@ from homeassistant.components.climate.const import ( SERVICE_SET_SWING_MODE, SERVICE_SET_TEMPERATURE, ) +from homeassistant.components.climate.reproduce_state import async_reproduce_states from homeassistant.const import ATTR_TEMPERATURE from homeassistant.core import Context, State