From 080c702d4f3bfbb6d8cbafa7cd1d363b05c21e66 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 18:56:21 +0100 Subject: [PATCH] Sort imports according to PEP8 for components starting with "C" (#29763) --- homeassistant/components/calendar/__init__.py | 1 - homeassistant/components/clickatell/notify.py | 3 +-- homeassistant/components/clicksend/notify.py | 3 +-- homeassistant/components/clicksend_tts/notify.py | 3 +-- homeassistant/components/configurator/__init__.py | 8 ++++---- homeassistant/components/conversation/__init__.py | 2 +- homeassistant/components/coolmaster/config_flow.py | 2 +- homeassistant/components/cups/sensor.py | 4 ++-- homeassistant/components/currencylayer/sensor.py | 10 +++++----- tests/components/canary/test_init.py | 5 +++-- tests/components/canary/test_sensor.py | 10 +++++----- tests/components/coinmarketcap/test_sensor.py | 4 ++-- tests/components/configurator/test_init.py | 2 +- tests/components/conversation/test_init.py | 4 ++-- tests/components/coolmaster/test_config_flow.py | 2 +- 15 files changed, 30 insertions(+), 33 deletions(-) diff --git a/homeassistant/components/calendar/__init__.py b/homeassistant/components/calendar/__init__.py index ca240925cf5..35b25b86d43 100644 --- a/homeassistant/components/calendar/__init__.py +++ b/homeassistant/components/calendar/__init__.py @@ -17,7 +17,6 @@ from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.template import DATE_STR_FORMAT from homeassistant.util import dt - # mypy: allow-untyped-defs, no-check-untyped-defs _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/clickatell/notify.py b/homeassistant/components/clickatell/notify.py index 26f2f30aeff..d59a553a4f6 100644 --- a/homeassistant/components/clickatell/notify.py +++ b/homeassistant/components/clickatell/notify.py @@ -4,11 +4,10 @@ import logging import requests import voluptuous as vol +from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService from homeassistant.const import CONF_API_KEY, CONF_RECIPIENT import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService - _LOGGER = logging.getLogger(__name__) DEFAULT_NAME = "clickatell" diff --git a/homeassistant/components/clicksend/notify.py b/homeassistant/components/clicksend/notify.py index 87fc217ac42..42136e9a09c 100644 --- a/homeassistant/components/clicksend/notify.py +++ b/homeassistant/components/clicksend/notify.py @@ -6,6 +6,7 @@ from aiohttp.hdrs import CONTENT_TYPE import requests import voluptuous as vol +from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService from homeassistant.const import ( CONF_API_KEY, CONF_RECIPIENT, @@ -15,8 +16,6 @@ from homeassistant.const import ( ) import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService - _LOGGER = logging.getLogger(__name__) BASE_API_URL = "https://rest.clicksend.com/v3" diff --git a/homeassistant/components/clicksend_tts/notify.py b/homeassistant/components/clicksend_tts/notify.py index ba30c61e937..400e72a7d0c 100644 --- a/homeassistant/components/clicksend_tts/notify.py +++ b/homeassistant/components/clicksend_tts/notify.py @@ -6,6 +6,7 @@ from aiohttp.hdrs import CONTENT_TYPE import requests import voluptuous as vol +from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService from homeassistant.const import ( CONF_API_KEY, CONF_RECIPIENT, @@ -14,8 +15,6 @@ from homeassistant.const import ( ) import homeassistant.helpers.config_validation as cv -from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService - _LOGGER = logging.getLogger(__name__) BASE_API_URL = "https://rest.clicksend.com/v3" diff --git a/homeassistant/components/configurator/__init__.py b/homeassistant/components/configurator/__init__.py index f3b2a41e917..78333d96355 100644 --- a/homeassistant/components/configurator/__init__.py +++ b/homeassistant/components/configurator/__init__.py @@ -9,14 +9,14 @@ the user has submitted configuration information. import functools as ft import logging -from homeassistant.core import callback as async_callback from homeassistant.const import ( - EVENT_TIME_CHANGED, - ATTR_FRIENDLY_NAME, ATTR_ENTITY_PICTURE, + ATTR_FRIENDLY_NAME, + EVENT_TIME_CHANGED, ) -from homeassistant.loader import bind_hass +from homeassistant.core import callback as async_callback from homeassistant.helpers.entity import async_generate_entity_id +from homeassistant.loader import bind_hass from homeassistant.util.async_ import run_callback_threadsafe _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/conversation/__init__.py b/homeassistant/components/conversation/__init__.py index ec5868e86fe..158a365981b 100644 --- a/homeassistant/components/conversation/__init__.py +++ b/homeassistant/components/conversation/__init__.py @@ -11,7 +11,7 @@ from homeassistant.helpers import config_validation as cv, intent from homeassistant.loader import bind_hass from .agent import AbstractConversationAgent -from .default_agent import async_register, DefaultAgent +from .default_agent import DefaultAgent, async_register _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/coolmaster/config_flow.py b/homeassistant/components/coolmaster/config_flow.py index fe52ea17b28..e9cef562647 100644 --- a/homeassistant/components/coolmaster/config_flow.py +++ b/homeassistant/components/coolmaster/config_flow.py @@ -3,7 +3,7 @@ from pycoolmasternet import CoolMasterNet import voluptuous as vol -from homeassistant import core, config_entries +from homeassistant import config_entries, core from homeassistant.const import CONF_HOST, CONF_PORT # pylint: disable=unused-import diff --git a/homeassistant/components/cups/sensor.py b/homeassistant/components/cups/sensor.py index 17a246561a5..7581891af6a 100644 --- a/homeassistant/components/cups/sensor.py +++ b/homeassistant/components/cups/sensor.py @@ -1,14 +1,14 @@ """Details about printers which are connected to CUPS.""" +from datetime import timedelta import importlib import logging -from datetime import timedelta import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import CONF_HOST, CONF_PORT from homeassistant.exceptions import PlatformNotReady +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/currencylayer/sensor.py b/homeassistant/components/currencylayer/sensor.py index d4660d70286..cbad07c0284 100644 --- a/homeassistant/components/currencylayer/sensor.py +++ b/homeassistant/components/currencylayer/sensor.py @@ -5,15 +5,15 @@ import logging import requests import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_API_KEY, - CONF_NAME, - CONF_BASE, - CONF_QUOTE, ATTR_ATTRIBUTION, + CONF_API_KEY, + CONF_BASE, + CONF_NAME, + CONF_QUOTE, ) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/canary/test_init.py b/tests/components/canary/test_init.py index cb671e30618..819d1ce0e90 100644 --- a/tests/components/canary/test_init.py +++ b/tests/components/canary/test_init.py @@ -1,9 +1,10 @@ """The tests for the Canary component.""" import unittest -from unittest.mock import patch, MagicMock, PropertyMock +from unittest.mock import MagicMock, PropertyMock, patch -import homeassistant.components.canary as canary from homeassistant import setup +import homeassistant.components.canary as canary + from tests.common import get_test_home_assistant diff --git a/tests/components/canary/test_sensor.py b/tests/components/canary/test_sensor.py index cfb8d46141a..7d5e829a347 100644 --- a/tests/components/canary/test_sensor.py +++ b/tests/components/canary/test_sensor.py @@ -3,16 +3,16 @@ import copy import unittest from unittest.mock import Mock -from homeassistant.components.canary import DATA_CANARY -from homeassistant.components.canary import sensor as canary +from homeassistant.components.canary import DATA_CANARY, sensor as canary from homeassistant.components.canary.sensor import ( - CanarySensor, - SENSOR_TYPES, ATTR_AIR_QUALITY, - STATE_AIR_QUALITY_NORMAL, + SENSOR_TYPES, STATE_AIR_QUALITY_ABNORMAL, + STATE_AIR_QUALITY_NORMAL, STATE_AIR_QUALITY_VERY_ABNORMAL, + CanarySensor, ) + from tests.common import get_test_home_assistant from tests.components.canary.test_init import mock_device, mock_location diff --git a/tests/components/coinmarketcap/test_sensor.py b/tests/components/coinmarketcap/test_sensor.py index d629bf14184..9d1e89fbc24 100644 --- a/tests/components/coinmarketcap/test_sensor.py +++ b/tests/components/coinmarketcap/test_sensor.py @@ -1,12 +1,12 @@ """Tests for the CoinMarketCap sensor platform.""" import json - import unittest from unittest.mock import patch import homeassistant.components.sensor as sensor from homeassistant.setup import setup_component -from tests.common import get_test_home_assistant, load_fixture, assert_setup_component + +from tests.common import assert_setup_component, get_test_home_assistant, load_fixture VALID_CONFIG = { "platform": "coinmarketcap", diff --git a/tests/components/configurator/test_init.py b/tests/components/configurator/test_init.py index 43395c0e7e8..b572609c5a2 100644 --- a/tests/components/configurator/test_init.py +++ b/tests/components/configurator/test_init.py @@ -3,7 +3,7 @@ import unittest import homeassistant.components.configurator as configurator -from homeassistant.const import EVENT_TIME_CHANGED, ATTR_FRIENDLY_NAME +from homeassistant.const import ATTR_FRIENDLY_NAME, EVENT_TIME_CHANGED from tests.common import get_test_home_assistant diff --git a/tests/components/conversation/test_init.py b/tests/components/conversation/test_init.py index 45008ef9447..f84d2109095 100644 --- a/tests/components/conversation/test_init.py +++ b/tests/components/conversation/test_init.py @@ -1,10 +1,10 @@ """The tests for the Conversation component.""" import pytest -from homeassistant.core import DOMAIN as HASS_DOMAIN, Context -from homeassistant.setup import async_setup_component from homeassistant.components import conversation +from homeassistant.core import DOMAIN as HASS_DOMAIN, Context from homeassistant.helpers import intent +from homeassistant.setup import async_setup_component from tests.common import async_mock_intent, async_mock_service diff --git a/tests/components/coolmaster/test_config_flow.py b/tests/components/coolmaster/test_config_flow.py index d0126ff2cb6..c71f308dece 100644 --- a/tests/components/coolmaster/test_config_flow.py +++ b/tests/components/coolmaster/test_config_flow.py @@ -2,7 +2,7 @@ from unittest.mock import patch from homeassistant import config_entries, setup -from homeassistant.components.coolmaster.const import DOMAIN, AVAILABLE_MODES +from homeassistant.components.coolmaster.const import AVAILABLE_MODES, DOMAIN from tests.common import mock_coro