diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py index ad9166e2410..d8dc584ae30 100644 --- a/homeassistant/components/mqtt/__init__.py +++ b/homeassistant/components/mqtt/__init__.py @@ -1,6 +1,5 @@ """Support for MQTT message handling.""" import asyncio -import sys from functools import partial, wraps import inspect from itertools import groupby @@ -10,6 +9,7 @@ from operator import attrgetter import os import socket import ssl +import sys import time from typing import Any, Callable, List, Optional, Union @@ -32,9 +32,9 @@ from homeassistant.const import ( ) from homeassistant.core import Event, ServiceCall, callback from homeassistant.exceptions import ( + ConfigEntryNotReady, HomeAssistantError, Unauthorized, - ConfigEntryNotReady, ) from homeassistant.helpers import config_validation as cv, template from homeassistant.helpers.dispatcher import async_dispatcher_connect @@ -47,16 +47,16 @@ from homeassistant.util.logging import catch_log_exception # Loading the config flow file will register the flow from . import config_flow, discovery, server # noqa: F401 pylint: disable=unused-import from .const import ( + ATTR_DISCOVERY_HASH, CONF_BROKER, CONF_DISCOVERY, - DEFAULT_DISCOVERY, CONF_STATE_TOPIC, - ATTR_DISCOVERY_HASH, - PROTOCOL_311, + DEFAULT_DISCOVERY, DEFAULT_QOS, + PROTOCOL_311, ) from .discovery import MQTT_DISCOVERY_UPDATED, clear_discovery_hash -from .models import PublishPayloadType, Message, MessageCallbackType +from .models import Message, MessageCallbackType, PublishPayloadType from .subscription import async_subscribe_topics, async_unsubscribe_topics _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/mqtt/camera.py b/homeassistant/components/mqtt/camera.py index f3ae36c5746..831c47c3621 100644 --- a/homeassistant/components/mqtt/camera.py +++ b/homeassistant/components/mqtt/camera.py @@ -7,7 +7,7 @@ import voluptuous as vol from homeassistant.components import camera, mqtt from homeassistant.components.camera import PLATFORM_SCHEMA, Camera -from homeassistant.const import CONF_NAME, CONF_DEVICE +from homeassistant.const import CONF_DEVICE, CONF_NAME from homeassistant.core import callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_connect diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py index 9b46057a414..a51590e0b59 100644 --- a/homeassistant/components/mqtt/climate.py +++ b/homeassistant/components/mqtt/climate.py @@ -20,14 +20,14 @@ from homeassistant.components.climate.const import ( HVAC_MODE_FAN_ONLY, HVAC_MODE_HEAT, HVAC_MODE_OFF, + PRESET_AWAY, + PRESET_NONE, SUPPORT_AUX_HEAT, SUPPORT_FAN_MODE, SUPPORT_PRESET_MODE, SUPPORT_SWING_MODE, SUPPORT_TARGET_TEMPERATURE, - PRESET_AWAY, SUPPORT_TARGET_TEMPERATURE_RANGE, - PRESET_NONE, ) from homeassistant.components.fan import SPEED_HIGH, SPEED_LOW, SPEED_MEDIUM from homeassistant.const import ( diff --git a/homeassistant/components/mqtt/device_tracker.py b/homeassistant/components/mqtt/device_tracker.py index d25d7ce21d3..bcc969f0354 100644 --- a/homeassistant/components/mqtt/device_tracker.py +++ b/homeassistant/components/mqtt/device_tracker.py @@ -5,9 +5,9 @@ import voluptuous as vol from homeassistant.components import mqtt from homeassistant.components.device_tracker import PLATFORM_SCHEMA, SOURCE_TYPES +from homeassistant.const import CONF_DEVICES, STATE_HOME, STATE_NOT_HOME from homeassistant.core import callback import homeassistant.helpers.config_validation as cv -from homeassistant.const import CONF_DEVICES, STATE_NOT_HOME, STATE_HOME from . import CONF_QOS diff --git a/homeassistant/components/mqtt/models.py b/homeassistant/components/mqtt/models.py index 46aaa23732f..cfdecd3383d 100644 --- a/homeassistant/components/mqtt/models.py +++ b/homeassistant/components/mqtt/models.py @@ -1,5 +1,5 @@ """Modesl used by multiple MQTT modules.""" -from typing import Union, Callable +from typing import Callable, Union import attr diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py index 28f1a7e9720..3e8f342ea94 100644 --- a/tests/components/mqtt/test_binary_sensor.py +++ b/tests/components/mqtt/test_binary_sensor.py @@ -1,7 +1,6 @@ """The tests for the MQTT binary sensor platform.""" from datetime import datetime, timedelta import json - from unittest.mock import ANY, patch from homeassistant.components import binary_sensor, mqtt diff --git a/tests/components/mqtt/test_camera.py b/tests/components/mqtt/test_camera.py index 70b5e941fe3..0e7d8ada759 100644 --- a/tests/components/mqtt/test_camera.py +++ b/tests/components/mqtt/test_camera.py @@ -1,6 +1,6 @@ """The tests for mqtt camera component.""" -from unittest.mock import ANY import json +from unittest.mock import ANY from homeassistant.components import camera, mqtt from homeassistant.components.mqtt.discovery import async_start diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py index 648448a6494..2db368d0311 100644 --- a/tests/components/mqtt/test_climate.py +++ b/tests/components/mqtt/test_climate.py @@ -11,19 +11,19 @@ from homeassistant.components import mqtt from homeassistant.components.climate import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP from homeassistant.components.climate.const import ( DOMAIN as CLIMATE_DOMAIN, - SUPPORT_AUX_HEAT, - SUPPORT_PRESET_MODE, - SUPPORT_FAN_MODE, - SUPPORT_SWING_MODE, - SUPPORT_TARGET_TEMPERATURE, HVAC_MODE_AUTO, HVAC_MODE_COOL, - HVAC_MODE_HEAT, HVAC_MODE_DRY, HVAC_MODE_FAN_ONLY, - SUPPORT_TARGET_TEMPERATURE_RANGE, - PRESET_NONE, + HVAC_MODE_HEAT, PRESET_ECO, + PRESET_NONE, + SUPPORT_AUX_HEAT, + SUPPORT_FAN_MODE, + SUPPORT_PRESET_MODE, + SUPPORT_SWING_MODE, + SUPPORT_TARGET_TEMPERATURE, + SUPPORT_TARGET_TEMPERATURE_RANGE, ) from homeassistant.components.mqtt.discovery import async_start from homeassistant.const import STATE_OFF, STATE_UNAVAILABLE diff --git a/tests/components/mqtt/test_cover.py b/tests/components/mqtt/test_cover.py index bb734d2c03d..b15518961a4 100644 --- a/tests/components/mqtt/test_cover.py +++ b/tests/components/mqtt/test_cover.py @@ -16,11 +16,11 @@ from homeassistant.const import ( SERVICE_SET_COVER_POSITION, SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER, + SERVICE_TOGGLE, + SERVICE_TOGGLE_COVER_TILT, STATE_CLOSED, STATE_OPEN, STATE_UNAVAILABLE, - SERVICE_TOGGLE, - SERVICE_TOGGLE_COVER_TILT, STATE_UNKNOWN, ) from homeassistant.setup import async_setup_component diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py index 860ef52a98a..2b6c65b919e 100644 --- a/tests/components/mqtt/test_discovery.py +++ b/tests/components/mqtt/test_discovery.py @@ -1,7 +1,6 @@ """The tests for the MQTT discovery.""" from pathlib import Path import re - from unittest.mock import patch from homeassistant.components import mqtt diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py index 6f2a87d1caa..3d8e261fdb2 100644 --- a/tests/components/mqtt/test_init.py +++ b/tests/components/mqtt/test_init.py @@ -15,8 +15,8 @@ from homeassistant.const import ( EVENT_HOMEASSISTANT_STOP, ) from homeassistant.core import callback -from homeassistant.setup import async_setup_component from homeassistant.exceptions import ConfigEntryNotReady +from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py index cd55a08482d..4e8e5f9bfd0 100644 --- a/tests/components/mqtt/test_sensor.py +++ b/tests/components/mqtt/test_sensor.py @@ -14,8 +14,8 @@ import homeassistant.util.dt as dt_util from tests.common import ( MockConfigEntry, async_fire_mqtt_message, - async_mock_mqtt_component, async_fire_time_changed, + async_mock_mqtt_component, mock_registry, ) diff --git a/tests/components/mqtt/test_state_vacuum.py b/tests/components/mqtt/test_state_vacuum.py index 7919e07767d..eb3071eb120 100644 --- a/tests/components/mqtt/test_state_vacuum.py +++ b/tests/components/mqtt/test_state_vacuum.py @@ -26,9 +26,9 @@ from homeassistant.components.vacuum import ( from homeassistant.const import ( CONF_NAME, CONF_PLATFORM, + ENTITY_MATCH_ALL, STATE_UNAVAILABLE, STATE_UNKNOWN, - ENTITY_MATCH_ALL, ) from homeassistant.setup import async_setup_component