From de915e1bf0a0378dfb6149beaba437e61216ac49 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 14:41:48 +0100 Subject: [PATCH] Sort imports according to PEP8 for components starting with "T" (#29778) --- homeassistant/components/tcp/sensor.py | 8 ++--- homeassistant/components/teksavvy/sensor.py | 2 +- homeassistant/components/telegram/notify.py | 3 +- .../components/telegram_bot/__init__.py | 8 ++--- .../components/telegram_bot/polling.py | 4 +-- homeassistant/components/telnet/switch.py | 2 +- .../components/thomson/device_tracker.py | 2 +- .../components/tile/device_tracker.py | 4 +-- homeassistant/components/time_date/sensor.py | 6 ++-- homeassistant/components/todoist/calendar.py | 2 +- .../components/tomato/device_tracker.py | 6 ++-- homeassistant/components/torque/sensor.py | 4 +-- .../components/totalconnect/__init__.py | 7 ++-- homeassistant/components/tplink/__init__.py | 2 +- .../components/trafikverket_train/sensor.py | 2 +- .../components/transmission/__init__.py | 2 +- .../components/transmission/sensor.py | 1 - .../components/transport_nsw/sensor.py | 6 ++-- homeassistant/components/twitter/notify.py | 7 ++-- tests/components/teksavvy/test_sensor.py | 1 + .../threshold/test_binary_sensor.py | 2 +- tests/components/timer/test_init.py | 32 +++++++++---------- .../components/timer/test_reproduce_state.py | 1 + tests/components/tod/test_binary_sensor.py | 12 ++++--- .../components/tomato/test_device_tracker.py | 5 +-- tests/components/tradfri/test_config_flow.py | 2 +- tests/components/tradfri/test_light.py | 3 +- tests/components/trend/test_binary_sensor.py | 2 +- tests/components/tts/test_init.py | 14 ++++---- tests/components/twilio/test_init.py | 1 + 30 files changed, 77 insertions(+), 76 deletions(-) diff --git a/homeassistant/components/tcp/sensor.py b/homeassistant/components/tcp/sensor.py index a387b3fc0bb7..2732f2d6bd19 100644 --- a/homeassistant/components/tcp/sensor.py +++ b/homeassistant/components/tcp/sensor.py @@ -1,23 +1,23 @@ """Support for TCP socket based sensors.""" import logging -import socket import select +import socket import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_NAME, CONF_HOST, - CONF_PORT, + CONF_NAME, CONF_PAYLOAD, + CONF_PORT, CONF_TIMEOUT, CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE, ) from homeassistant.exceptions import TemplateError -from homeassistant.helpers.entity import Entity import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/teksavvy/sensor.py b/homeassistant/components/teksavvy/sensor.py index dc8b16b8ce18..fe183129eaad 100644 --- a/homeassistant/components/teksavvy/sensor.py +++ b/homeassistant/components/teksavvy/sensor.py @@ -1,8 +1,8 @@ """Support for TekSavvy Bandwidth Monitor.""" from datetime import timedelta import logging -import async_timeout +import async_timeout import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA diff --git a/homeassistant/components/telegram/notify.py b/homeassistant/components/telegram/notify.py index 23c36e3bafa9..ceb660d9e1df 100644 --- a/homeassistant/components/telegram/notify.py +++ b/homeassistant/components/telegram/notify.py @@ -3,8 +3,6 @@ import logging import voluptuous as vol -from homeassistant.const import ATTR_LOCATION - from homeassistant.components.notify import ( ATTR_DATA, ATTR_MESSAGE, @@ -13,6 +11,7 @@ from homeassistant.components.notify import ( PLATFORM_SCHEMA, BaseNotificationService, ) +from homeassistant.const import ATTR_LOCATION _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py index 12bde6c72d84..b91c37b35dee 100644 --- a/homeassistant/components/telegram_bot/__init__.py +++ b/homeassistant/components/telegram_bot/__init__.py @@ -1,8 +1,8 @@ """Support to send and receive Telegram messages.""" -import io -from ipaddress import ip_network from functools import partial import importlib +import io +from ipaddress import ip_network import logging import requests @@ -26,11 +26,11 @@ from homeassistant.const import ( CONF_API_KEY, CONF_PLATFORM, CONF_TIMEOUT, - HTTP_DIGEST_AUTHENTICATION, CONF_URL, + HTTP_DIGEST_AUTHENTICATION, ) -import homeassistant.helpers.config_validation as cv from homeassistant.exceptions import TemplateError +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/telegram_bot/polling.py b/homeassistant/components/telegram_bot/polling.py index cf3d13d5edc8..8bdeef25118c 100644 --- a/homeassistant/components/telegram_bot/polling.py +++ b/homeassistant/components/telegram_bot/polling.py @@ -2,8 +2,8 @@ import logging from telegram import Update -from telegram.error import TelegramError, TimedOut, NetworkError, RetryAfter -from telegram.ext import Updater, Handler +from telegram.error import NetworkError, RetryAfter, TelegramError, TimedOut +from telegram.ext import Handler, Updater from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP from homeassistant.core import callback diff --git a/homeassistant/components/telnet/switch.py b/homeassistant/components/telnet/switch.py index 87fb70bb8886..a99fe044c469 100644 --- a/homeassistant/components/telnet/switch.py +++ b/homeassistant/components/telnet/switch.py @@ -16,9 +16,9 @@ from homeassistant.const import ( CONF_COMMAND_STATE, CONF_NAME, CONF_PORT, - CONF_TIMEOUT, CONF_RESOURCE, CONF_SWITCHES, + CONF_TIMEOUT, CONF_VALUE_TEMPLATE, ) import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/thomson/device_tracker.py b/homeassistant/components/thomson/device_tracker.py index 214c1b8cfb4e..1f3fda6cc72c 100644 --- a/homeassistant/components/thomson/device_tracker.py +++ b/homeassistant/components/thomson/device_tracker.py @@ -5,13 +5,13 @@ import telnetlib import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.device_tracker import ( DOMAIN, PLATFORM_SCHEMA, DeviceScanner, ) from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tile/device_tracker.py b/homeassistant/components/tile/device_tracker.py index 1cb88f67c2fc..8bc4fb11cdfa 100644 --- a/homeassistant/components/tile/device_tracker.py +++ b/homeassistant/components/tile/device_tracker.py @@ -1,13 +1,13 @@ """Support for Tile® Bluetooth trackers.""" -import logging from datetime import timedelta +import logging from pytile import async_login from pytile.errors import SessionExpiredError, TileError import voluptuous as vol from homeassistant.components.device_tracker import PLATFORM_SCHEMA -from homeassistant.const import CONF_USERNAME, CONF_MONITORED_VARIABLES, CONF_PASSWORD +from homeassistant.const import CONF_MONITORED_VARIABLES, CONF_PASSWORD, CONF_USERNAME from homeassistant.helpers import aiohttp_client, config_validation as cv from homeassistant.helpers.event import async_track_time_interval from homeassistant.util import slugify diff --git a/homeassistant/components/time_date/sensor.py b/homeassistant/components/time_date/sensor.py index cbe4c85ace31..9edbdd3a9a19 100644 --- a/homeassistant/components/time_date/sensor.py +++ b/homeassistant/components/time_date/sensor.py @@ -4,13 +4,13 @@ import logging import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_DISPLAY_OPTIONS -from homeassistant.helpers.entity import Entity +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv -import homeassistant.util.dt as dt_util +from homeassistant.helpers.entity import Entity from homeassistant.helpers.event import async_track_point_in_utc_time +import homeassistant.util.dt as dt_util _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/todoist/calendar.py b/homeassistant/components/todoist/calendar.py index eabec37a0539..ed6476af229d 100644 --- a/homeassistant/components/todoist/calendar.py +++ b/homeassistant/components/todoist/calendar.py @@ -16,8 +16,8 @@ from .const import ( ALL_TASKS, CHECKED, COMPLETED, - CONF_PROJECT_DUE_DATE, CONF_EXTRA_PROJECTS, + CONF_PROJECT_DUE_DATE, CONF_PROJECT_LABEL_WHITELIST, CONF_PROJECT_WHITELIST, CONTENT, diff --git a/homeassistant/components/tomato/device_tracker.py b/homeassistant/components/tomato/device_tracker.py index 57348c9710a9..d53b5ab6cf0d 100644 --- a/homeassistant/components/tomato/device_tracker.py +++ b/homeassistant/components/tomato/device_tracker.py @@ -6,7 +6,6 @@ import re import requests import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.device_tracker import ( DOMAIN, PLATFORM_SCHEMA, @@ -14,12 +13,13 @@ from homeassistant.components.device_tracker import ( ) from homeassistant.const import ( CONF_HOST, + CONF_PASSWORD, CONF_PORT, CONF_SSL, - CONF_VERIFY_SSL, - CONF_PASSWORD, CONF_USERNAME, + CONF_VERIFY_SSL, ) +import homeassistant.helpers.config_validation as cv CONF_HTTP_ID = "http_id" diff --git a/homeassistant/components/torque/sensor.py b/homeassistant/components/torque/sensor.py index 10161856a47a..f084c135e474 100644 --- a/homeassistant/components/torque/sensor.py +++ b/homeassistant/components/torque/sensor.py @@ -4,12 +4,12 @@ import re import voluptuous as vol -from homeassistant.core import callback from homeassistant.components.http import HomeAssistantView from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_EMAIL, CONF_NAME -from homeassistant.helpers.entity import Entity +from homeassistant.core import callback import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/totalconnect/__init__.py b/homeassistant/components/totalconnect/__init__.py index c14ac36057e2..020f2d9c07fb 100644 --- a/homeassistant/components/totalconnect/__init__.py +++ b/homeassistant/components/totalconnect/__init__.py @@ -1,13 +1,12 @@ """The totalconnect component.""" import logging -import voluptuous as vol from total_connect_client import TotalConnectClient +import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.helpers import discovery from homeassistant.const import CONF_PASSWORD, CONF_USERNAME - +from homeassistant.helpers import discovery +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py index 7aa261564f3a..764060135a21 100644 --- a/homeassistant/components/tplink/__init__.py +++ b/homeassistant/components/tplink/__init__.py @@ -13,8 +13,8 @@ from .common import ( CONF_DIMMER, CONF_DISCOVERY, CONF_LIGHT, - CONF_SWITCH, CONF_STRIP, + CONF_SWITCH, SmartDevices, async_discover_devices, get_static_devices, diff --git a/homeassistant/components/trafikverket_train/sensor.py b/homeassistant/components/trafikverket_train/sensor.py index e6789ca5aee7..12f3cf73e50d 100644 --- a/homeassistant/components/trafikverket_train/sensor.py +++ b/homeassistant/components/trafikverket_train/sensor.py @@ -11,8 +11,8 @@ from homeassistant.const import ( CONF_API_KEY, CONF_NAME, CONF_WEEKDAY, - WEEKDAYS, DEVICE_CLASS_TIMESTAMP, + WEEKDAYS, ) from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/transmission/__init__.py b/homeassistant/components/transmission/__init__.py index 7bbc61a192ff..3e6f2407d176 100644 --- a/homeassistant/components/transmission/__init__.py +++ b/homeassistant/components/transmission/__init__.py @@ -22,12 +22,12 @@ from homeassistant.helpers.event import async_track_time_interval from .const import ( ATTR_TORRENT, + DATA_UPDATED, DEFAULT_NAME, DEFAULT_PORT, DEFAULT_SCAN_INTERVAL, DOMAIN, SERVICE_ADD_TORRENT, - DATA_UPDATED, ) from .errors import AuthenticationError, CannotConnect, UnknownError diff --git a/homeassistant/components/transmission/sensor.py b/homeassistant/components/transmission/sensor.py index c51d48eb5325..6bedc793ed91 100644 --- a/homeassistant/components/transmission/sensor.py +++ b/homeassistant/components/transmission/sensor.py @@ -8,7 +8,6 @@ from homeassistant.helpers.entity import Entity from .const import DOMAIN, SENSOR_TYPES, STATE_ATTR_TORRENT_INFO - _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/transport_nsw/sensor.py b/homeassistant/components/transport_nsw/sensor.py index 79df41ac4899..7c6990de0856 100644 --- a/homeassistant/components/transport_nsw/sensor.py +++ b/homeassistant/components/transport_nsw/sensor.py @@ -2,13 +2,13 @@ from datetime import timedelta import logging -import voluptuous as vol from TransportNSW import TransportNSW +import voluptuous as vol +from homeassistant.components.sensor import PLATFORM_SCHEMA +from homeassistant.const import ATTR_ATTRIBUTION, ATTR_MODE, CONF_API_KEY, CONF_NAME import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity -from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.const import ATTR_MODE, CONF_NAME, CONF_API_KEY, ATTR_ATTRIBUTION _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/twitter/notify.py b/homeassistant/components/twitter/notify.py index 39faf987ae09..768e1ee73166 100644 --- a/homeassistant/components/twitter/notify.py +++ b/homeassistant/components/twitter/notify.py @@ -9,15 +9,14 @@ import os from TwitterAPI import TwitterAPI import voluptuous as vol -from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME -import homeassistant.helpers.config_validation as cv -from homeassistant.helpers.event import async_track_point_in_time - from homeassistant.components.notify import ( ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService, ) +from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.event import async_track_point_in_time _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/teksavvy/test_sensor.py b/tests/components/teksavvy/test_sensor.py index 9e2714f03885..723cf07f173d 100644 --- a/tests/components/teksavvy/test_sensor.py +++ b/tests/components/teksavvy/test_sensor.py @@ -1,5 +1,6 @@ """Tests for the TekSavvy sensor platform.""" import asyncio + from homeassistant.bootstrap import async_setup_component from homeassistant.components.teksavvy.sensor import TekSavvyData from homeassistant.helpers.aiohttp_client import async_get_clientsession diff --git a/tests/components/threshold/test_binary_sensor.py b/tests/components/threshold/test_binary_sensor.py index 147e2e37cb49..3eb6299b3bed 100644 --- a/tests/components/threshold/test_binary_sensor.py +++ b/tests/components/threshold/test_binary_sensor.py @@ -1,8 +1,8 @@ """The test for the threshold sensor platform.""" import unittest -from homeassistant.setup import setup_component from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, STATE_UNKNOWN, TEMP_CELSIUS +from homeassistant.setup import setup_component from tests.common import get_test_home_assistant diff --git a/tests/components/timer/test_init.py b/tests/components/timer/test_init.py index 5d57cd2f2d89..39648b68fd79 100644 --- a/tests/components/timer/test_init.py +++ b/tests/components/timer/test_init.py @@ -1,31 +1,31 @@ """The tests for the timer component.""" # pylint: disable=protected-access import asyncio -import logging from datetime import timedelta +import logging -from homeassistant.core import CoreState -from homeassistant.setup import async_setup_component from homeassistant.components.timer import ( - DOMAIN, + ATTR_DURATION, CONF_DURATION, + CONF_ICON, CONF_NAME, + DOMAIN, + EVENT_TIMER_CANCELLED, + EVENT_TIMER_FINISHED, + EVENT_TIMER_PAUSED, + EVENT_TIMER_RESTARTED, + EVENT_TIMER_STARTED, + SERVICE_CANCEL, + SERVICE_FINISH, + SERVICE_PAUSE, + SERVICE_START, STATUS_ACTIVE, STATUS_IDLE, STATUS_PAUSED, - CONF_ICON, - ATTR_DURATION, - EVENT_TIMER_FINISHED, - EVENT_TIMER_CANCELLED, - EVENT_TIMER_STARTED, - EVENT_TIMER_RESTARTED, - EVENT_TIMER_PAUSED, - SERVICE_START, - SERVICE_PAUSE, - SERVICE_CANCEL, - SERVICE_FINISH, ) -from homeassistant.const import ATTR_ICON, ATTR_FRIENDLY_NAME, CONF_ENTITY_ID +from homeassistant.const import ATTR_FRIENDLY_NAME, ATTR_ICON, CONF_ENTITY_ID +from homeassistant.core import CoreState +from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow from tests.common import async_fire_time_changed diff --git a/tests/components/timer/test_reproduce_state.py b/tests/components/timer/test_reproduce_state.py index 5539d8610c3b..80205a40f5dd 100644 --- a/tests/components/timer/test_reproduce_state.py +++ b/tests/components/timer/test_reproduce_state.py @@ -9,6 +9,7 @@ from homeassistant.components.timer import ( STATUS_PAUSED, ) from homeassistant.core import State + from tests.common import async_mock_service diff --git a/tests/components/tod/test_binary_sensor.py b/tests/components/tod/test_binary_sensor.py index 2ef361e1dac3..03581d16c094 100644 --- a/tests/components/tod/test_binary_sensor.py +++ b/tests/components/tod/test_binary_sensor.py @@ -1,16 +1,18 @@ """Test Times of the Day Binary Sensor.""" +from datetime import datetime, timedelta import unittest from unittest.mock import patch -from datetime import timedelta, datetime + import pytz from homeassistant import setup -import homeassistant.core as ha from homeassistant.const import STATE_OFF, STATE_ON -import homeassistant.util.dt as dt_util -from homeassistant.setup import setup_component -from tests.common import get_test_home_assistant, assert_setup_component +import homeassistant.core as ha from homeassistant.helpers.sun import get_astral_event_date, get_astral_event_next +from homeassistant.setup import setup_component +import homeassistant.util.dt as dt_util + +from tests.common import assert_setup_component, get_test_home_assistant class TestBinarySensorTod(unittest.TestCase): diff --git a/tests/components/tomato/test_device_tracker.py b/tests/components/tomato/test_device_tracker.py index 89ca2a6e1aa4..969578054667 100644 --- a/tests/components/tomato/test_device_tracker.py +++ b/tests/components/tomato/test_device_tracker.py @@ -1,5 +1,6 @@ """The tests for the Tomato device tracker platform.""" from unittest import mock + import pytest import requests import requests_mock @@ -9,11 +10,11 @@ from homeassistant.components.device_tracker import DOMAIN import homeassistant.components.tomato.device_tracker as tomato from homeassistant.const import ( CONF_HOST, - CONF_USERNAME, CONF_PASSWORD, + CONF_PLATFORM, CONF_PORT, CONF_SSL, - CONF_PLATFORM, + CONF_USERNAME, CONF_VERIFY_SSL, ) diff --git a/tests/components/tradfri/test_config_flow.py b/tests/components/tradfri/test_config_flow.py index cc5c6be4c729..151607b1ed8e 100644 --- a/tests/components/tradfri/test_config_flow.py +++ b/tests/components/tradfri/test_config_flow.py @@ -6,7 +6,7 @@ import pytest from homeassistant import data_entry_flow from homeassistant.components.tradfri import config_flow -from tests.common import mock_coro, MockConfigEntry +from tests.common import MockConfigEntry, mock_coro @pytest.fixture diff --git a/tests/components/tradfri/test_light.py b/tests/components/tradfri/test_light.py index 4c691f66af87..90449120aaf2 100644 --- a/tests/components/tradfri/test_light.py +++ b/tests/components/tradfri/test_light.py @@ -1,7 +1,7 @@ """Tradfri lights platform tests.""" from copy import deepcopy -from unittest.mock import Mock, MagicMock, patch, PropertyMock +from unittest.mock import MagicMock, Mock, PropertyMock, patch import pytest from pytradfri.device import Device @@ -12,7 +12,6 @@ from homeassistant.components import tradfri from tests.common import MockConfigEntry - DEFAULT_TEST_FEATURES = { "can_set_dimmer": False, "can_set_color": False, diff --git a/tests/components/trend/test_binary_sensor.py b/tests/components/trend/test_binary_sensor.py index e4b5cf5df6cd..d78cf793d2fc 100644 --- a/tests/components/trend/test_binary_sensor.py +++ b/tests/components/trend/test_binary_sensor.py @@ -5,7 +5,7 @@ from unittest.mock import patch from homeassistant import setup import homeassistant.util.dt as dt_util -from tests.common import get_test_home_assistant, assert_setup_component +from tests.common import assert_setup_component, get_test_home_assistant class TestTrendBinarySensor: diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py index 1107aace1330..389f9478ad3f 100644 --- a/tests/components/tts/test_init.py +++ b/tests/components/tts/test_init.py @@ -2,27 +2,27 @@ import ctypes import os import shutil -from unittest.mock import patch, PropertyMock +from unittest.mock import PropertyMock, patch import pytest import requests -import homeassistant.components.http as http -import homeassistant.components.tts as tts from homeassistant.components.demo.tts import DemoProvider +import homeassistant.components.http as http from homeassistant.components.media_player.const import ( - SERVICE_PLAY_MEDIA, - MEDIA_TYPE_MUSIC, ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE, DOMAIN as DOMAIN_MP, + MEDIA_TYPE_MUSIC, + SERVICE_PLAY_MEDIA, ) -from homeassistant.setup import setup_component, async_setup_component +import homeassistant.components.tts as tts +from homeassistant.setup import async_setup_component, setup_component from tests.common import ( + assert_setup_component, get_test_home_assistant, get_test_instance_port, - assert_setup_component, mock_service, ) diff --git a/tests/components/twilio/test_init.py b/tests/components/twilio/test_init.py index 5795967e492b..196d0e99991d 100644 --- a/tests/components/twilio/test_init.py +++ b/tests/components/twilio/test_init.py @@ -4,6 +4,7 @@ from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.components import twilio from homeassistant.core import callback + from tests.common import MockDependency