From 415176e350d64ebe0523bedd5b4101c194a5f7de Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 21:05:08 +0100 Subject: [PATCH] Sort imports according to PEP8 for template (#29655) --- homeassistant/components/template/__init__.py | 3 +- .../components/template/binary_sensor.py | 19 ++++----- homeassistant/components/template/cover.py | 39 ++++++++++--------- homeassistant/components/template/fan.py | 29 +++++++------- homeassistant/components/template/light.py | 19 ++++----- homeassistant/components/template/lock.py | 12 +++--- homeassistant/components/template/sensor.py | 22 +++++------ homeassistant/components/template/switch.py | 15 +++---- homeassistant/components/template/vacuum.py | 23 +++++------ .../components/template/test_binary_sensor.py | 16 ++++---- tests/components/template/test_cover.py | 11 +++--- tests/components/template/test_fan.py | 16 ++++---- tests/components/template/test_light.py | 6 +-- tests/components/template/test_lock.py | 7 ++-- tests/components/template/test_sensor.py | 12 ++++-- tests/components/template/test_switch.py | 6 +-- tests/components/template/test_vacuum.py | 5 ++- 17 files changed, 135 insertions(+), 125 deletions(-) diff --git a/homeassistant/components/template/__init__.py b/homeassistant/components/template/__init__.py index 80421b8e3f8..f100d663d8c 100644 --- a/homeassistant/components/template/__init__.py +++ b/homeassistant/components/template/__init__.py @@ -1,11 +1,10 @@ """The template component.""" +from itertools import chain import logging -from itertools import chain from homeassistant.const import MATCH_ALL - _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/template/binary_sensor.py b/homeassistant/components/template/binary_sensor.py index 116862abc79..3ca25a33d64 100644 --- a/homeassistant/components/template/binary_sensor.py +++ b/homeassistant/components/template/binary_sensor.py @@ -3,28 +3,29 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.binary_sensor import ( - BinarySensorDevice, + DEVICE_CLASSES_SCHEMA, ENTITY_ID_FORMAT, PLATFORM_SCHEMA, - DEVICE_CLASSES_SCHEMA, + BinarySensorDevice, ) from homeassistant.const import ( - ATTR_FRIENDLY_NAME, ATTR_ENTITY_ID, - CONF_VALUE_TEMPLATE, - CONF_ICON_TEMPLATE, - CONF_ENTITY_PICTURE_TEMPLATE, - CONF_SENSORS, + ATTR_FRIENDLY_NAME, CONF_DEVICE_CLASS, + CONF_ENTITY_PICTURE_TEMPLATE, + CONF_ICON_TEMPLATE, + CONF_SENSORS, + CONF_VALUE_TEMPLATE, EVENT_HOMEASSISTANT_START, MATCH_ALL, ) +from homeassistant.core import callback from homeassistant.exceptions import TemplateError import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import async_generate_entity_id -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 + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/cover.py b/homeassistant/components/template/cover.py index 22035af24ec..c55c3f97df5 100644 --- a/homeassistant/components/template/cover.py +++ b/homeassistant/components/template/cover.py @@ -3,40 +3,41 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.cover import ( - ENTITY_ID_FORMAT, - CoverDevice, - PLATFORM_SCHEMA, - DEVICE_CLASSES_SCHEMA, - SUPPORT_OPEN_TILT, - SUPPORT_CLOSE_TILT, - SUPPORT_STOP_TILT, - SUPPORT_SET_TILT_POSITION, - SUPPORT_OPEN, - SUPPORT_CLOSE, - SUPPORT_STOP, - SUPPORT_SET_POSITION, ATTR_POSITION, ATTR_TILT_POSITION, + DEVICE_CLASSES_SCHEMA, + ENTITY_ID_FORMAT, + PLATFORM_SCHEMA, + SUPPORT_CLOSE, + SUPPORT_CLOSE_TILT, + SUPPORT_OPEN, + SUPPORT_OPEN_TILT, + SUPPORT_SET_POSITION, + SUPPORT_SET_TILT_POSITION, + SUPPORT_STOP, + SUPPORT_STOP_TILT, + CoverDevice, ) from homeassistant.const import ( - CONF_FRIENDLY_NAME, - CONF_ENTITY_ID, - EVENT_HOMEASSISTANT_START, - CONF_VALUE_TEMPLATE, - CONF_ICON_TEMPLATE, CONF_DEVICE_CLASS, + CONF_ENTITY_ID, CONF_ENTITY_PICTURE_TEMPLATE, + CONF_FRIENDLY_NAME, + CONF_ICON_TEMPLATE, CONF_OPTIMISTIC, - STATE_OPEN, + CONF_VALUE_TEMPLATE, + EVENT_HOMEASSISTANT_START, STATE_CLOSED, + STATE_OPEN, ) +from homeassistant.core import callback from homeassistant.exceptions import TemplateError import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import async_generate_entity_id from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.script import Script + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/fan.py b/homeassistant/components/template/fan.py index ebb9bcc8b14..89f54444376 100644 --- a/homeassistant/components/template/fan.py +++ b/homeassistant/components/template/fan.py @@ -3,35 +3,36 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.fan import ( - SPEED_LOW, - SPEED_MEDIUM, - SPEED_HIGH, - SUPPORT_SET_SPEED, - SUPPORT_OSCILLATE, - FanEntity, - ATTR_SPEED, + ATTR_DIRECTION, ATTR_OSCILLATING, - ENTITY_ID_FORMAT, - SUPPORT_DIRECTION, + ATTR_SPEED, DIRECTION_FORWARD, DIRECTION_REVERSE, - ATTR_DIRECTION, + ENTITY_ID_FORMAT, + SPEED_HIGH, + SPEED_LOW, + SPEED_MEDIUM, + SUPPORT_DIRECTION, + SUPPORT_OSCILLATE, + SUPPORT_SET_SPEED, + FanEntity, ) from homeassistant.const import ( + CONF_ENTITY_ID, CONF_FRIENDLY_NAME, CONF_VALUE_TEMPLATE, - CONF_ENTITY_ID, - STATE_ON, - STATE_OFF, EVENT_HOMEASSISTANT_START, + STATE_OFF, + STATE_ON, STATE_UNKNOWN, ) from homeassistant.core import callback from homeassistant.exceptions import TemplateError +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import async_generate_entity_id from homeassistant.helpers.script import Script + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/light.py b/homeassistant/components/template/light.py index b71aadd0155..e18833aae39 100644 --- a/homeassistant/components/template/light.py +++ b/homeassistant/components/template/light.py @@ -3,30 +3,31 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.light import ( ATTR_BRIGHTNESS, ENTITY_ID_FORMAT, - Light, SUPPORT_BRIGHTNESS, + Light, ) from homeassistant.const import ( - CONF_VALUE_TEMPLATE, - CONF_ICON_TEMPLATE, - CONF_ENTITY_PICTURE_TEMPLATE, CONF_ENTITY_ID, + CONF_ENTITY_PICTURE_TEMPLATE, CONF_FRIENDLY_NAME, - STATE_ON, - STATE_OFF, - EVENT_HOMEASSISTANT_START, + CONF_ICON_TEMPLATE, CONF_LIGHTS, + CONF_VALUE_TEMPLATE, + EVENT_HOMEASSISTANT_START, + STATE_OFF, + STATE_ON, ) -from homeassistant.helpers.config_validation import PLATFORM_SCHEMA +from homeassistant.core import callback from homeassistant.exceptions import TemplateError import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.config_validation import PLATFORM_SCHEMA from homeassistant.helpers.entity import async_generate_entity_id from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.script import Script + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/lock.py b/homeassistant/components/template/lock.py index 71e9cc6642d..f4a6b55dd18 100644 --- a/homeassistant/components/template/lock.py +++ b/homeassistant/components/template/lock.py @@ -3,22 +3,22 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv - -from homeassistant.core import callback -from homeassistant.components.lock import LockDevice, PLATFORM_SCHEMA +from homeassistant.components.lock import PLATFORM_SCHEMA, LockDevice from homeassistant.const import ( CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE, EVENT_HOMEASSISTANT_START, - STATE_ON, - STATE_LOCKED, MATCH_ALL, + STATE_LOCKED, + STATE_ON, ) +from homeassistant.core import callback from homeassistant.exceptions import TemplateError +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.script import Script + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/sensor.py b/homeassistant/components/template/sensor.py index 4ea7daa54f6..a4e28265e1d 100644 --- a/homeassistant/components/template/sensor.py +++ b/homeassistant/components/template/sensor.py @@ -4,30 +4,30 @@ from typing import Optional import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.sensor import ( + DEVICE_CLASSES_SCHEMA, ENTITY_ID_FORMAT, PLATFORM_SCHEMA, - DEVICE_CLASSES_SCHEMA, ) from homeassistant.const import ( + ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, ATTR_UNIT_OF_MEASUREMENT, - CONF_VALUE_TEMPLATE, - CONF_ICON_TEMPLATE, - CONF_ENTITY_PICTURE_TEMPLATE, - ATTR_ENTITY_ID, - CONF_SENSORS, - EVENT_HOMEASSISTANT_START, - CONF_FRIENDLY_NAME_TEMPLATE, - MATCH_ALL, CONF_DEVICE_CLASS, + CONF_ENTITY_PICTURE_TEMPLATE, + CONF_FRIENDLY_NAME_TEMPLATE, + CONF_ICON_TEMPLATE, + CONF_SENSORS, + CONF_VALUE_TEMPLATE, + EVENT_HOMEASSISTANT_START, + MATCH_ALL, ) - +from homeassistant.core import callback from homeassistant.exceptions import TemplateError import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity, async_generate_entity_id from homeassistant.helpers.event import async_track_state_change + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/switch.py b/homeassistant/components/template/switch.py index e06ca0c8d54..f44f7256e19 100644 --- a/homeassistant/components/template/switch.py +++ b/homeassistant/components/template/switch.py @@ -3,28 +3,29 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.switch import ( ENTITY_ID_FORMAT, - SwitchDevice, PLATFORM_SCHEMA, + SwitchDevice, ) from homeassistant.const import ( + ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, - CONF_VALUE_TEMPLATE, - CONF_ICON_TEMPLATE, CONF_ENTITY_PICTURE_TEMPLATE, + CONF_ICON_TEMPLATE, + CONF_SWITCHES, + CONF_VALUE_TEMPLATE, + EVENT_HOMEASSISTANT_START, STATE_OFF, STATE_ON, - ATTR_ENTITY_ID, - CONF_SWITCHES, - EVENT_HOMEASSISTANT_START, ) +from homeassistant.core import callback from homeassistant.exceptions import TemplateError import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import async_generate_entity_id from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.script import Script + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/homeassistant/components/template/vacuum.py b/homeassistant/components/template/vacuum.py index 8201842e131..4946d54edc3 100644 --- a/homeassistant/components/template/vacuum.py +++ b/homeassistant/components/template/vacuum.py @@ -3,7 +3,6 @@ import logging import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.vacuum import ( ATTR_FAN_SPEED, DOMAIN, @@ -14,35 +13,37 @@ from homeassistant.components.vacuum import ( SERVICE_SET_FAN_SPEED, SERVICE_START, SERVICE_STOP, + STATE_CLEANING, + STATE_DOCKED, + STATE_ERROR, + STATE_IDLE, + STATE_PAUSED, + STATE_RETURNING, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, SUPPORT_FAN_SPEED, SUPPORT_LOCATE, SUPPORT_PAUSE, SUPPORT_RETURN_HOME, - SUPPORT_STOP, - SUPPORT_STATE, SUPPORT_START, + SUPPORT_STATE, + SUPPORT_STOP, StateVacuumDevice, - STATE_CLEANING, - STATE_DOCKED, - STATE_PAUSED, - STATE_IDLE, - STATE_RETURNING, - STATE_ERROR, ) from homeassistant.const import ( + CONF_ENTITY_ID, CONF_FRIENDLY_NAME, CONF_VALUE_TEMPLATE, - CONF_ENTITY_ID, - MATCH_ALL, EVENT_HOMEASSISTANT_START, + MATCH_ALL, STATE_UNKNOWN, ) from homeassistant.core import callback from homeassistant.exceptions import TemplateError +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import async_generate_entity_id from homeassistant.helpers.script import Script + from . import extract_entities, initialise_templates from .const import CONF_AVAILABILITY_TEMPLATE diff --git a/tests/components/template/test_binary_sensor.py b/tests/components/template/test_binary_sensor.py index b17b98f2f10..b024bbc311f 100644 --- a/tests/components/template/test_binary_sensor.py +++ b/tests/components/template/test_binary_sensor.py @@ -3,24 +3,24 @@ from datetime import timedelta import unittest from unittest import mock -from homeassistant.const import ( - MATCH_ALL, - EVENT_HOMEASSISTANT_START, - STATE_UNAVAILABLE, - STATE_ON, - STATE_OFF, -) from homeassistant import setup from homeassistant.components.template import binary_sensor as template +from homeassistant.const import ( + EVENT_HOMEASSISTANT_START, + MATCH_ALL, + STATE_OFF, + STATE_ON, + STATE_UNAVAILABLE, +) from homeassistant.exceptions import TemplateError from homeassistant.helpers import template as template_hlpr from homeassistant.util.async_ import run_callback_threadsafe import homeassistant.util.dt as dt_util from tests.common import ( - get_test_home_assistant, assert_setup_component, async_fire_time_changed, + get_test_home_assistant, ) diff --git a/tests/components/template/test_cover.py b/tests/components/template/test_cover.py index d3be01cbdc3..c3e1f2843fd 100644 --- a/tests/components/template/test_cover.py +++ b/tests/components/template/test_cover.py @@ -1,5 +1,6 @@ """The tests the cover command line platform.""" import logging + import pytest from homeassistant import setup @@ -8,18 +9,18 @@ from homeassistant.const import ( ATTR_ENTITY_ID, SERVICE_CLOSE_COVER, SERVICE_CLOSE_COVER_TILT, - SERVICE_TOGGLE, - SERVICE_TOGGLE_COVER_TILT, SERVICE_OPEN_COVER, SERVICE_OPEN_COVER_TILT, SERVICE_SET_COVER_POSITION, SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER, + SERVICE_TOGGLE, + SERVICE_TOGGLE_COVER_TILT, STATE_CLOSED, - STATE_UNAVAILABLE, - STATE_OPEN, - STATE_ON, STATE_OFF, + STATE_ON, + STATE_OPEN, + STATE_UNAVAILABLE, ) from tests.common import assert_setup_component, async_mock_service diff --git a/tests/components/template/test_fan.py b/tests/components/template/test_fan.py index 5753684795b..981b87ff43e 100644 --- a/tests/components/template/test_fan.py +++ b/tests/components/template/test_fan.py @@ -1,23 +1,23 @@ """The tests for the Template fan platform.""" import logging -import pytest +import pytest import voluptuous as vol from homeassistant import setup -from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE from homeassistant.components.fan import ( - ATTR_SPEED, - ATTR_OSCILLATING, - SPEED_LOW, - SPEED_MEDIUM, - SPEED_HIGH, ATTR_DIRECTION, + ATTR_OSCILLATING, + ATTR_SPEED, DIRECTION_FORWARD, DIRECTION_REVERSE, + SPEED_HIGH, + SPEED_LOW, + SPEED_MEDIUM, ) +from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE -from tests.common import async_mock_service, assert_setup_component +from tests.common import assert_setup_component, async_mock_service from tests.components.fan import common _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/template/test_light.py b/tests/components/template/test_light.py index c2dd49a76fb..62d377a9337 100644 --- a/tests/components/template/test_light.py +++ b/tests/components/template/test_light.py @@ -1,12 +1,12 @@ """The tests for the Template light platform.""" import logging -from homeassistant.core import callback from homeassistant import setup from homeassistant.components.light import ATTR_BRIGHTNESS -from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE +from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE +from homeassistant.core import callback -from tests.common import get_test_home_assistant, assert_setup_component +from tests.common import assert_setup_component, get_test_home_assistant from tests.components.light import common _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/template/test_lock.py b/tests/components/template/test_lock.py index 32a34411b33..10f959efed8 100644 --- a/tests/components/template/test_lock.py +++ b/tests/components/template/test_lock.py @@ -1,13 +1,12 @@ """The tests for the Template lock platform.""" import logging -from homeassistant.core import callback from homeassistant import setup from homeassistant.components import lock -from homeassistant.const import ATTR_ENTITY_ID -from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE +from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, STATE_UNAVAILABLE +from homeassistant.core import callback -from tests.common import get_test_home_assistant, assert_setup_component +from tests.common import assert_setup_component, get_test_home_assistant _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/template/test_sensor.py b/tests/components/template/test_sensor.py index 7ae34b04c00..e9033b3dfe3 100644 --- a/tests/components/template/test_sensor.py +++ b/tests/components/template/test_sensor.py @@ -1,9 +1,13 @@ """The test for the Template sensor platform.""" -from homeassistant.const import EVENT_HOMEASSISTANT_START -from homeassistant.setup import setup_component, async_setup_component +from homeassistant.const import ( + EVENT_HOMEASSISTANT_START, + STATE_OFF, + STATE_ON, + STATE_UNAVAILABLE, +) +from homeassistant.setup import async_setup_component, setup_component -from tests.common import get_test_home_assistant, assert_setup_component -from homeassistant.const import STATE_UNAVAILABLE, STATE_ON, STATE_OFF +from tests.common import assert_setup_component, get_test_home_assistant class TestTemplateSensor: diff --git a/tests/components/template/test_switch.py b/tests/components/template/test_switch.py index 3adc5dcad46..a66028a318f 100644 --- a/tests/components/template/test_switch.py +++ b/tests/components/template/test_switch.py @@ -1,9 +1,9 @@ """The tests for the Template switch platform.""" -from homeassistant.core import callback from homeassistant import setup -from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE +from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE +from homeassistant.core import callback -from tests.common import get_test_home_assistant, assert_setup_component +from tests.common import assert_setup_component, get_test_home_assistant from tests.components.switch import common diff --git a/tests/components/template/test_vacuum.py b/tests/components/template/test_vacuum.py index da0e8e59ede..4080b75f46a 100644 --- a/tests/components/template/test_vacuum.py +++ b/tests/components/template/test_vacuum.py @@ -1,9 +1,9 @@ """The tests for the Template vacuum platform.""" import logging + import pytest from homeassistant import setup -from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNKNOWN, STATE_UNAVAILABLE from homeassistant.components.vacuum import ( ATTR_BATTERY_LEVEL, STATE_CLEANING, @@ -12,8 +12,9 @@ from homeassistant.components.vacuum import ( STATE_PAUSED, STATE_RETURNING, ) +from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN -from tests.common import async_mock_service, assert_setup_component +from tests.common import assert_setup_component, async_mock_service from tests.components.vacuum import common _LOGGER = logging.getLogger(__name__)