From 0d696b84b27adf8b395cecdfed4a5522e55a2334 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Wed, 21 Sep 2022 18:57:41 +0200 Subject: [PATCH] Cleanup root component imports in tests (#78893) --- tests/components/advantage_air/test_climate.py | 2 +- tests/components/airzone/test_climate.py | 2 +- tests/components/alexa/test_smart_home.py | 2 +- tests/components/atag/test_climate.py | 4 +++- tests/components/balboa/test_climate.py | 2 +- tests/components/blackbird/test_media_player.py | 2 +- tests/components/blebox/test_climate.py | 2 +- tests/components/climate/common.py | 4 ++-- tests/components/climate/test_recorder.py | 2 +- tests/components/climate/test_reproduce_state.py | 2 +- tests/components/deconz/test_climate.py | 12 +++++------- tests/components/demo/test_climate.py | 2 +- tests/components/devolo_home_control/test_climate.py | 4 ++-- tests/components/freedompro/test_climate.py | 2 +- tests/components/fritzbox/__init__.py | 2 +- tests/components/fritzbox/test_climate.py | 2 +- tests/components/generic_thermostat/test_climate.py | 2 +- tests/components/google_translate/test_tts.py | 2 +- tests/components/gree/test_bridge.py | 2 +- tests/components/gree/test_climate.py | 4 ++-- tests/components/heos/test_init.py | 2 +- tests/components/homekit/test_type_media_players.py | 4 ++-- .../specific_devices/test_ecobee3.py | 2 +- .../specific_devices/test_ecobee_501.py | 2 +- .../specific_devices/test_lennox_e30.py | 2 +- .../specific_devices/test_lg_tv.py | 2 +- tests/components/homekit_controller/test_climate.py | 2 +- tests/components/homematicip_cloud/test_climate.py | 4 ++-- tests/components/kaleidescape/test_media_player.py | 2 +- tests/components/knx/test_climate.py | 2 +- tests/components/kodi/test_device_trigger.py | 2 +- tests/components/marytts/test_tts.py | 2 +- tests/components/media_player/common.py | 2 +- tests/components/media_player/test_recorder.py | 2 +- .../components/media_player/test_reproduce_state.py | 2 +- tests/components/melissa/test_climate.py | 2 +- tests/components/modbus/test_climate.py | 3 +-- tests/components/monoprice/test_media_player.py | 2 +- tests/components/mqtt/test_climate.py | 5 +++-- tests/components/netatmo/test_climate.py | 10 ++++------ tests/components/nexia/test_climate.py | 2 +- tests/components/plex/test_browse_media.py | 2 +- tests/components/plugwise/test_climate.py | 2 +- tests/components/samsungtv/test_init.py | 2 +- tests/components/sensibo/test_climate.py | 2 +- tests/components/sensibo/test_entity.py | 2 +- tests/components/smartthings/test_climate.py | 2 +- tests/components/smarttub/test_climate.py | 2 +- tests/components/sonos/test_services.py | 3 +-- tests/components/soundtouch/conftest.py | 2 +- tests/components/soundtouch/test_media_player.py | 2 +- tests/components/tts/test_notify.py | 2 +- tests/components/unifiprotect/test_media_player.py | 2 +- tests/components/universal/test_media_player.py | 2 +- tests/components/venstar/test_climate.py | 2 +- tests/components/venstar/util.py | 2 +- tests/components/vera/test_climate.py | 2 +- tests/components/vizio/test_media_player.py | 2 +- tests/components/voicerss/test_tts.py | 2 +- tests/components/whirlpool/test_climate.py | 2 +- tests/components/ws66i/test_media_player.py | 4 ++-- tests/components/yandextts/test_tts.py | 2 +- tests/components/zha/test_climate.py | 2 +- tests/components/zwave_js/test_api.py | 5 +---- tests/components/zwave_js/test_climate.py | 2 +- 65 files changed, 82 insertions(+), 88 deletions(-) diff --git a/tests/components/advantage_air/test_climate.py b/tests/components/advantage_air/test_climate.py index 39999ba4ed9..feb2a790e30 100644 --- a/tests/components/advantage_air/test_climate.py +++ b/tests/components/advantage_air/test_climate.py @@ -11,7 +11,7 @@ from homeassistant.components.advantage_air.const import ( ADVANTAGE_AIR_STATE_OFF, ADVANTAGE_AIR_STATE_ON, ) -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_FAN_MODE, ATTR_HVAC_MODE, DOMAIN as CLIMATE_DOMAIN, diff --git a/tests/components/airzone/test_climate.py b/tests/components/airzone/test_climate.py index dcb493351ba..a492abd8c61 100644 --- a/tests/components/airzone/test_climate.py +++ b/tests/components/airzone/test_climate.py @@ -14,7 +14,7 @@ from aioairzone.exceptions import AirzoneError import pytest from homeassistant.components.airzone.const import API_TEMPERATURE_STEP -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_HUMIDITY, ATTR_CURRENT_TEMPERATURE, ATTR_HVAC_ACTION, diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py index 85926810290..9d329e76c45 100644 --- a/tests/components/alexa/test_smart_home.py +++ b/tests/components/alexa/test_smart_home.py @@ -8,7 +8,7 @@ import pytest from homeassistant.components.alexa import messages, smart_home import homeassistant.components.camera as camera from homeassistant.components.cover import CoverDeviceClass -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, diff --git a/tests/components/atag/test_climate.py b/tests/components/atag/test_climate.py index 2369859a8e6..485ad0308bc 100644 --- a/tests/components/atag/test_climate.py +++ b/tests/components/atag/test_climate.py @@ -7,11 +7,13 @@ from homeassistant.components.climate import ( ATTR_HVAC_MODE, ATTR_PRESET_MODE, DOMAIN as CLIMATE_DOMAIN, + PRESET_AWAY, SERVICE_SET_HVAC_MODE, SERVICE_SET_PRESET_MODE, SERVICE_SET_TEMPERATURE, + HVACAction, + HVACMode, ) -from homeassistant.components.climate.const import PRESET_AWAY, HVACAction, HVACMode from homeassistant.components.homeassistant import DOMAIN as HA_DOMAIN from homeassistant.const import ( ATTR_ENTITY_ID, diff --git a/tests/components/balboa/test_climate.py b/tests/components/balboa/test_climate.py index ce3498c1d9f..571ec1f432e 100644 --- a/tests/components/balboa/test_climate.py +++ b/tests/components/balboa/test_climate.py @@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch import pytest -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_FAN_MODE, ATTR_HVAC_ACTION, ATTR_HVAC_MODES, diff --git a/tests/components/blackbird/test_media_player.py b/tests/components/blackbird/test_media_player.py index a2f5f9914da..1841af773bb 100644 --- a/tests/components/blackbird/test_media_player.py +++ b/tests/components/blackbird/test_media_player.py @@ -11,7 +11,7 @@ from homeassistant.components.blackbird.media_player import ( PLATFORM_SCHEMA, setup_platform, ) -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, diff --git a/tests/components/blebox/test_climate.py b/tests/components/blebox/test_climate.py index 8ae1c80d960..7bef83e632a 100644 --- a/tests/components/blebox/test_climate.py +++ b/tests/components/blebox/test_climate.py @@ -5,7 +5,7 @@ from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_TEMPERATURE, ATTR_HVAC_ACTION, ATTR_HVAC_MODE, diff --git a/tests/components/climate/common.py b/tests/components/climate/common.py index 5b75dc98e69..7d66b886810 100644 --- a/tests/components/climate/common.py +++ b/tests/components/climate/common.py @@ -3,8 +3,8 @@ All containing methods are legacy helpers that should not be used by new components. Instead call the service directly. """ -from homeassistant.components.climate import _LOGGER -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( + _LOGGER, ATTR_AUX_HEAT, ATTR_FAN_MODE, ATTR_HUMIDITY, diff --git a/tests/components/climate/test_recorder.py b/tests/components/climate/test_recorder.py index 7ed604495dc..bf254d2c02f 100644 --- a/tests/components/climate/test_recorder.py +++ b/tests/components/climate/test_recorder.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import timedelta from homeassistant.components import climate -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_FAN_MODES, ATTR_HVAC_MODES, ATTR_MAX_HUMIDITY, diff --git a/tests/components/climate/test_reproduce_state.py b/tests/components/climate/test_reproduce_state.py index c91340b43cb..dc6bb97cde6 100644 --- a/tests/components/climate/test_reproduce_state.py +++ b/tests/components/climate/test_reproduce_state.py @@ -2,7 +2,7 @@ import pytest -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_AUX_HEAT, ATTR_FAN_MODE, ATTR_HUMIDITY, diff --git a/tests/components/deconz/test_climate.py b/tests/components/deconz/test_climate.py index c621ce02823..e85b8b0b6fd 100644 --- a/tests/components/deconz/test_climate.py +++ b/tests/components/deconz/test_climate.py @@ -4,18 +4,12 @@ from unittest.mock import patch import pytest from homeassistant.components.climate import ( - DOMAIN as CLIMATE_DOMAIN, - SERVICE_SET_FAN_MODE, - SERVICE_SET_HVAC_MODE, - SERVICE_SET_PRESET_MODE, - SERVICE_SET_TEMPERATURE, -) -from homeassistant.components.climate.const import ( ATTR_FAN_MODE, ATTR_HVAC_MODE, ATTR_PRESET_MODE, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, + DOMAIN as CLIMATE_DOMAIN, FAN_AUTO, FAN_HIGH, FAN_LOW, @@ -25,6 +19,10 @@ from homeassistant.components.climate.const import ( PRESET_BOOST, PRESET_COMFORT, PRESET_ECO, + SERVICE_SET_FAN_MODE, + SERVICE_SET_HVAC_MODE, + SERVICE_SET_PRESET_MODE, + SERVICE_SET_TEMPERATURE, HVACAction, HVACMode, ) diff --git a/tests/components/demo/test_climate.py b/tests/components/demo/test_climate.py index 332d2bf4f2e..67431ebb208 100644 --- a/tests/components/demo/test_climate.py +++ b/tests/components/demo/test_climate.py @@ -3,7 +3,7 @@ import pytest import voluptuous as vol -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_AUX_HEAT, ATTR_CURRENT_HUMIDITY, ATTR_CURRENT_TEMPERATURE, diff --git a/tests/components/devolo_home_control/test_climate.py b/tests/components/devolo_home_control/test_climate.py index 4fca1825459..98200b66476 100644 --- a/tests/components/devolo_home_control/test_climate.py +++ b/tests/components/devolo_home_control/test_climate.py @@ -1,9 +1,9 @@ """Tests for the devolo Home Control climate.""" from unittest.mock import patch -from homeassistant.components.climate import DOMAIN -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_HVAC_MODE, + DOMAIN, SERVICE_SET_TEMPERATURE, HVACMode, ) diff --git a/tests/components/freedompro/test_climate.py b/tests/components/freedompro/test_climate.py index da65abffeed..f12248da5cd 100644 --- a/tests/components/freedompro/test_climate.py +++ b/tests/components/freedompro/test_climate.py @@ -14,8 +14,8 @@ from homeassistant.components.climate import ( DOMAIN as CLIMATE_DOMAIN, SERVICE_SET_HVAC_MODE, SERVICE_SET_TEMPERATURE, + HVACMode, ) -from homeassistant.components.climate.const import HVACMode from homeassistant.const import ATTR_ENTITY_ID from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.util.dt import utcnow diff --git a/tests/components/fritzbox/__init__.py b/tests/components/fritzbox/__init__.py index 3ed4327d8e3..acafd19c924 100644 --- a/tests/components/fritzbox/__init__.py +++ b/tests/components/fritzbox/__init__.py @@ -4,7 +4,7 @@ from __future__ import annotations from typing import Any from unittest.mock import Mock -from homeassistant.components.climate.const import PRESET_COMFORT, PRESET_ECO +from homeassistant.components.climate import PRESET_COMFORT, PRESET_ECO from homeassistant.components.fritzbox.const import DOMAIN from homeassistant.core import HomeAssistant diff --git a/tests/components/fritzbox/test_climate.py b/tests/components/fritzbox/test_climate.py index 9cd7f1a74d7..26c3e5a3d34 100644 --- a/tests/components/fritzbox/test_climate.py +++ b/tests/components/fritzbox/test_climate.py @@ -4,7 +4,7 @@ from unittest.mock import Mock, call from requests.exceptions import HTTPError -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_TEMPERATURE, ATTR_HVAC_MODE, ATTR_HVAC_MODES, diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py index c4d23b41579..f6a8795a29d 100644 --- a/tests/components/generic_thermostat/test_climate.py +++ b/tests/components/generic_thermostat/test_climate.py @@ -7,7 +7,7 @@ import voluptuous as vol from homeassistant import config as hass_config from homeassistant.components import input_boolean, switch -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_PRESET_MODE, DOMAIN, PRESET_ACTIVITY, diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py index cc80d9c64b9..562f35655d0 100644 --- a/tests/components/google_translate/test_tts.py +++ b/tests/components/google_translate/test_tts.py @@ -7,7 +7,7 @@ from gtts import gTTSError import pytest from homeassistant.components import media_source, tts -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_MEDIA_CONTENT_ID, DOMAIN as DOMAIN_MP, SERVICE_PLAY_MEDIA, diff --git a/tests/components/gree/test_bridge.py b/tests/components/gree/test_bridge.py index 13522b1216b..24672606f34 100644 --- a/tests/components/gree/test_bridge.py +++ b/tests/components/gree/test_bridge.py @@ -4,7 +4,7 @@ from unittest.mock import patch import pytest -from homeassistant.components.climate.const import DOMAIN +from homeassistant.components.climate import DOMAIN from homeassistant.components.gree.const import COORDINATORS, DOMAIN as GREE import homeassistant.util.dt as dt_util diff --git a/tests/components/gree/test_climate.py b/tests/components/gree/test_climate.py index ac818c7fd32..de873726c44 100644 --- a/tests/components/gree/test_climate.py +++ b/tests/components/gree/test_climate.py @@ -6,8 +6,7 @@ from greeclimate.device import HorizontalSwing, VerticalSwing from greeclimate.exceptions import DeviceNotBoundError, DeviceTimeoutError import pytest -from homeassistant.components.climate import ClimateEntityFeature -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, ATTR_HVAC_MODE, @@ -32,6 +31,7 @@ from homeassistant.components.climate.const import ( SWING_HORIZONTAL, SWING_OFF, SWING_VERTICAL, + ClimateEntityFeature, HVACMode, ) from homeassistant.components.gree.climate import FAN_MODES_REVERSE, HVAC_MODES_REVERSE diff --git a/tests/components/heos/test_init.py b/tests/components/heos/test_init.py index 6edbf7d8543..f55e8102b33 100644 --- a/tests/components/heos/test_init.py +++ b/tests/components/heos/test_init.py @@ -15,7 +15,7 @@ from homeassistant.components.heos.const import ( DATA_SOURCE_MANAGER, DOMAIN, ) -from homeassistant.components.media_player.const import DOMAIN as MEDIA_PLAYER_DOMAIN +from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN from homeassistant.const import CONF_HOST from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.setup import async_setup_component diff --git a/tests/components/homekit/test_type_media_players.py b/tests/components/homekit/test_type_media_players.py index 7446b0d4c3a..dbdc2b0ba55 100644 --- a/tests/components/homekit/test_type_media_players.py +++ b/tests/components/homekit/test_type_media_players.py @@ -18,13 +18,13 @@ from homeassistant.components.homekit.type_media_players import ( MediaPlayer, TelevisionMediaPlayer, ) -from homeassistant.components.media_player import MediaPlayerDeviceClass -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE_LIST, ATTR_MEDIA_VOLUME_LEVEL, ATTR_MEDIA_VOLUME_MUTED, DOMAIN, + MediaPlayerDeviceClass, ) from homeassistant.const import ( ATTR_DEVICE_CLASS, diff --git a/tests/components/homekit_controller/specific_devices/test_ecobee3.py b/tests/components/homekit_controller/specific_devices/test_ecobee3.py index 27392afc9b0..69a7d4f809c 100644 --- a/tests/components/homekit_controller/specific_devices/test_ecobee3.py +++ b/tests/components/homekit_controller/specific_devices/test_ecobee3.py @@ -9,7 +9,7 @@ from unittest import mock from aiohomekit import AccessoryNotFoundError from aiohomekit.testing import FakePairing -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( SUPPORT_TARGET_HUMIDITY, SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_TEMPERATURE_RANGE, diff --git a/tests/components/homekit_controller/specific_devices/test_ecobee_501.py b/tests/components/homekit_controller/specific_devices/test_ecobee_501.py index 716ad6bc7c0..cf498a61e81 100644 --- a/tests/components/homekit_controller/specific_devices/test_ecobee_501.py +++ b/tests/components/homekit_controller/specific_devices/test_ecobee_501.py @@ -1,7 +1,7 @@ """Tests for Ecobee 501.""" -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( SUPPORT_FAN_MODE, SUPPORT_TARGET_HUMIDITY, SUPPORT_TARGET_TEMPERATURE, diff --git a/tests/components/homekit_controller/specific_devices/test_lennox_e30.py b/tests/components/homekit_controller/specific_devices/test_lennox_e30.py index 9bb31394cbd..1bb31241023 100644 --- a/tests/components/homekit_controller/specific_devices/test_lennox_e30.py +++ b/tests/components/homekit_controller/specific_devices/test_lennox_e30.py @@ -4,7 +4,7 @@ Regression tests for Aqara Gateway V3. https://github.com/home-assistant/core/issues/20885 """ -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_TEMPERATURE_RANGE, ) diff --git a/tests/components/homekit_controller/specific_devices/test_lg_tv.py b/tests/components/homekit_controller/specific_devices/test_lg_tv.py index 26909dabc59..22d29f7500d 100644 --- a/tests/components/homekit_controller/specific_devices/test_lg_tv.py +++ b/tests/components/homekit_controller/specific_devices/test_lg_tv.py @@ -1,6 +1,6 @@ """Make sure that handling real world LG HomeKit characteristics isn't broken.""" -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_SELECT_SOURCE, diff --git a/tests/components/homekit_controller/test_climate.py b/tests/components/homekit_controller/test_climate.py index 3a939948595..c5cad7015d8 100644 --- a/tests/components/homekit_controller/test_climate.py +++ b/tests/components/homekit_controller/test_climate.py @@ -8,7 +8,7 @@ from aiohomekit.model.characteristics import ( ) from aiohomekit.model.services import ServicesTypes -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( DOMAIN, SERVICE_SET_FAN_MODE, SERVICE_SET_HUMIDITY, diff --git a/tests/components/homematicip_cloud/test_climate.py b/tests/components/homematicip_cloud/test_climate.py index 93fa1700629..1f7b91d59a6 100644 --- a/tests/components/homematicip_cloud/test_climate.py +++ b/tests/components/homematicip_cloud/test_climate.py @@ -4,12 +4,12 @@ import datetime from homematicip.base.enums import AbsenceType from homematicip.functionalHomes import IndoorClimateHome -from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_TEMPERATURE, ATTR_HVAC_ACTION, ATTR_PRESET_MODE, ATTR_PRESET_MODES, + DOMAIN as CLIMATE_DOMAIN, PRESET_AWAY, PRESET_BOOST, PRESET_ECO, diff --git a/tests/components/kaleidescape/test_media_player.py b/tests/components/kaleidescape/test_media_player.py index 11f5d5f5f2b..f38c61d3e73 100644 --- a/tests/components/kaleidescape/test_media_player.py +++ b/tests/components/kaleidescape/test_media_player.py @@ -5,7 +5,7 @@ from unittest.mock import MagicMock from kaleidescape import const as kaleidescape_const from kaleidescape.device import Movie -from homeassistant.components.media_player.const import DOMAIN as MEDIA_PLAYER_DOMAIN +from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN from homeassistant.const import ( ATTR_ENTITY_ID, SERVICE_MEDIA_NEXT_TRACK, diff --git a/tests/components/knx/test_climate.py b/tests/components/knx/test_climate.py index 38d329755d6..454b814638c 100644 --- a/tests/components/knx/test_climate.py +++ b/tests/components/knx/test_climate.py @@ -1,5 +1,5 @@ """Test KNX climate.""" -from homeassistant.components.climate.const import PRESET_ECO, PRESET_SLEEP, HVACMode +from homeassistant.components.climate import PRESET_ECO, PRESET_SLEEP, HVACMode from homeassistant.components.knx.schema import ClimateSchema from homeassistant.const import CONF_NAME, STATE_IDLE from homeassistant.core import HomeAssistant diff --git a/tests/components/kodi/test_device_trigger.py b/tests/components/kodi/test_device_trigger.py index 505473209ba..9e3295f5ac0 100644 --- a/tests/components/kodi/test_device_trigger.py +++ b/tests/components/kodi/test_device_trigger.py @@ -4,7 +4,7 @@ import pytest import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType from homeassistant.components.kodi import DOMAIN -from homeassistant.components.media_player.const import DOMAIN as MP_DOMAIN +from homeassistant.components.media_player import DOMAIN as MP_DOMAIN from homeassistant.setup import async_setup_component from . import init_integration diff --git a/tests/components/marytts/test_tts.py b/tests/components/marytts/test_tts.py index 60211f7dc0c..04f3f4f6dcd 100644 --- a/tests/components/marytts/test_tts.py +++ b/tests/components/marytts/test_tts.py @@ -6,7 +6,7 @@ from unittest.mock import patch import pytest from homeassistant.components import media_source, tts -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_MEDIA_CONTENT_ID, DOMAIN as DOMAIN_MP, SERVICE_PLAY_MEDIA, diff --git a/tests/components/media_player/common.py b/tests/components/media_player/common.py index 7b1c9cb45a1..db2ef76b210 100644 --- a/tests/components/media_player/common.py +++ b/tests/components/media_player/common.py @@ -3,7 +3,7 @@ All containing methods are legacy helpers that should not be used by new components. Instead call the service directly. """ -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE, diff --git a/tests/components/media_player/test_recorder.py b/tests/components/media_player/test_recorder.py index 1d053a23cee..dd1329be81e 100644 --- a/tests/components/media_player/test_recorder.py +++ b/tests/components/media_player/test_recorder.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import timedelta from homeassistant.components import media_player -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_ENTITY_PICTURE_LOCAL, ATTR_INPUT_SOURCE_LIST, ATTR_MEDIA_POSITION, diff --git a/tests/components/media_player/test_reproduce_state.py b/tests/components/media_player/test_reproduce_state.py index f880130d4bd..cc30058d4b1 100644 --- a/tests/components/media_player/test_reproduce_state.py +++ b/tests/components/media_player/test_reproduce_state.py @@ -2,7 +2,7 @@ import pytest -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE, diff --git a/tests/components/melissa/test_climate.py b/tests/components/melissa/test_climate.py index 75d053dc011..9eb2a9fda78 100644 --- a/tests/components/melissa/test_climate.py +++ b/tests/components/melissa/test_climate.py @@ -2,7 +2,7 @@ import json from unittest.mock import AsyncMock, Mock, patch -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( FAN_HIGH, FAN_LOW, FAN_MEDIUM, diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py index e19a2b18186..942f6997c21 100644 --- a/tests/components/modbus/test_climate.py +++ b/tests/components/modbus/test_climate.py @@ -1,8 +1,7 @@ """The tests for the Modbus climate component.""" import pytest -from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN -from homeassistant.components.climate.const import HVACMode +from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN, HVACMode from homeassistant.components.modbus.const import ( CONF_CLIMATES, CONF_DATA_TYPE, diff --git a/tests/components/monoprice/test_media_player.py b/tests/components/monoprice/test_media_player.py index 0a11d665395..0d2969853f4 100644 --- a/tests/components/monoprice/test_media_player.py +++ b/tests/components/monoprice/test_media_player.py @@ -4,7 +4,7 @@ from unittest.mock import patch from serial import SerialException -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE_LIST, ATTR_MEDIA_VOLUME_LEVEL, diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py index ec2501e11d3..d7d278be160 100644 --- a/tests/components/mqtt/test_climate.py +++ b/tests/components/mqtt/test_climate.py @@ -7,8 +7,7 @@ import pytest import voluptuous as vol from homeassistant.components import climate, mqtt -from homeassistant.components.climate import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_AUX_HEAT, ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, @@ -16,6 +15,8 @@ from homeassistant.components.climate.const import ( ATTR_SWING_MODE, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, + DEFAULT_MAX_TEMP, + DEFAULT_MIN_TEMP, PRESET_ECO, ClimateEntityFeature, HVACAction, diff --git a/tests/components/netatmo/test_climate.py b/tests/components/netatmo/test_climate.py index a90023e29f7..0d51a53ec71 100644 --- a/tests/components/netatmo/test_climate.py +++ b/tests/components/netatmo/test_climate.py @@ -2,18 +2,16 @@ from unittest.mock import patch from homeassistant.components.climate import ( + ATTR_HVAC_MODE, + ATTR_PRESET_MODE, DOMAIN as CLIMATE_DOMAIN, + PRESET_AWAY, + PRESET_BOOST, SERVICE_SET_HVAC_MODE, SERVICE_SET_PRESET_MODE, SERVICE_SET_TEMPERATURE, SERVICE_TURN_OFF, SERVICE_TURN_ON, -) -from homeassistant.components.climate.const import ( - ATTR_HVAC_MODE, - ATTR_PRESET_MODE, - PRESET_AWAY, - PRESET_BOOST, HVACMode, ) from homeassistant.components.netatmo.climate import PRESET_FROST_GUARD, PRESET_SCHEDULE diff --git a/tests/components/nexia/test_climate.py b/tests/components/nexia/test_climate.py index 797fbb4014c..bbe0c254edc 100644 --- a/tests/components/nexia/test_climate.py +++ b/tests/components/nexia/test_climate.py @@ -1,5 +1,5 @@ """The lock tests for the august platform.""" -from homeassistant.components.climate.const import HVACMode +from homeassistant.components.climate import HVACMode from .util import async_init_integration diff --git a/tests/components/plex/test_browse_media.py b/tests/components/plex/test_browse_media.py index 6af11a61191..0e08afeb0c2 100644 --- a/tests/components/plex/test_browse_media.py +++ b/tests/components/plex/test_browse_media.py @@ -4,7 +4,7 @@ from unittest.mock import Mock, patch from yarl import URL -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE, ) diff --git a/tests/components/plugwise/test_climate.py b/tests/components/plugwise/test_climate.py index bf110cd8a91..58faeda8d7c 100644 --- a/tests/components/plugwise/test_climate.py +++ b/tests/components/plugwise/test_climate.py @@ -4,7 +4,7 @@ from unittest.mock import MagicMock from plugwise.exceptions import PlugwiseException import pytest -from homeassistant.components.climate.const import HVACMode +from homeassistant.components.climate import HVACMode from homeassistant.core import HomeAssistant from homeassistant.exceptions import HomeAssistantError diff --git a/tests/components/samsungtv/test_init.py b/tests/components/samsungtv/test_init.py index 7d688a5febb..3b4e33ebf3e 100644 --- a/tests/components/samsungtv/test_init.py +++ b/tests/components/samsungtv/test_init.py @@ -3,7 +3,7 @@ from unittest.mock import Mock, patch import pytest -from homeassistant.components.media_player.const import DOMAIN, SUPPORT_TURN_ON +from homeassistant.components.media_player import DOMAIN, SUPPORT_TURN_ON from homeassistant.components.samsungtv.const import ( CONF_ON_ACTION, CONF_SSDP_MAIN_TV_AGENT_LOCATION, diff --git a/tests/components/sensibo/test_climate.py b/tests/components/sensibo/test_climate.py index b66bbd14afb..f9c3a7cb301 100644 --- a/tests/components/sensibo/test_climate.py +++ b/tests/components/sensibo/test_climate.py @@ -8,7 +8,7 @@ from pysensibo.model import SensiboData import pytest from voluptuous import MultipleInvalid -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_FAN_MODE, ATTR_HVAC_MODE, ATTR_SWING_MODE, diff --git a/tests/components/sensibo/test_entity.py b/tests/components/sensibo/test_entity.py index 818d9ddb924..68275be4cf7 100644 --- a/tests/components/sensibo/test_entity.py +++ b/tests/components/sensibo/test_entity.py @@ -6,7 +6,7 @@ from unittest.mock import patch from pysensibo.model import SensiboData import pytest -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_FAN_MODE, DOMAIN as CLIMATE_DOMAIN, SERVICE_SET_FAN_MODE, diff --git a/tests/components/smartthings/test_climate.py b/tests/components/smartthings/test_climate.py index 825b8259276..22532139dde 100644 --- a/tests/components/smartthings/test_climate.py +++ b/tests/components/smartthings/test_climate.py @@ -8,7 +8,7 @@ from pysmartthings import Attribute, Capability from pysmartthings.device import Status import pytest -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_HUMIDITY, ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, diff --git a/tests/components/smarttub/test_climate.py b/tests/components/smarttub/test_climate.py index b290475d245..c123968e7fd 100644 --- a/tests/components/smarttub/test_climate.py +++ b/tests/components/smarttub/test_climate.py @@ -1,7 +1,7 @@ """Test the SmartTub climate platform.""" import smarttub -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_TEMPERATURE, ATTR_HVAC_ACTION, ATTR_HVAC_MODE, diff --git a/tests/components/sonos/test_services.py b/tests/components/sonos/test_services.py index d0bf3bf3a06..7f2bfc2fb8a 100644 --- a/tests/components/sonos/test_services.py +++ b/tests/components/sonos/test_services.py @@ -3,8 +3,7 @@ from unittest.mock import Mock, patch import pytest -from homeassistant.components.media_player import DOMAIN as MP_DOMAIN -from homeassistant.components.media_player.const import SERVICE_JOIN +from homeassistant.components.media_player import DOMAIN as MP_DOMAIN, SERVICE_JOIN from homeassistant.components.sonos.const import DATA_SONOS from homeassistant.exceptions import HomeAssistantError diff --git a/tests/components/soundtouch/conftest.py b/tests/components/soundtouch/conftest.py index 21de9e2ed47..e944da89d8c 100644 --- a/tests/components/soundtouch/conftest.py +++ b/tests/components/soundtouch/conftest.py @@ -2,7 +2,7 @@ import pytest from requests_mock import Mocker -from homeassistant.components.media_player.const import DOMAIN as MEDIA_PLAYER_DOMAIN +from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN from homeassistant.components.soundtouch.const import DOMAIN from homeassistant.const import CONF_HOST, CONF_NAME diff --git a/tests/components/soundtouch/test_media_player.py b/tests/components/soundtouch/test_media_player.py index 5105d07479c..f60ec4022ae 100644 --- a/tests/components/soundtouch/test_media_player.py +++ b/tests/components/soundtouch/test_media_player.py @@ -4,7 +4,7 @@ from typing import Any from requests_mock import Mocker -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, ATTR_MEDIA_ALBUM_NAME, ATTR_MEDIA_ARTIST, diff --git a/tests/components/tts/test_notify.py b/tests/components/tts/test_notify.py index 912896dd3e2..d19567333dc 100644 --- a/tests/components/tts/test_notify.py +++ b/tests/components/tts/test_notify.py @@ -3,7 +3,7 @@ import pytest import yarl import homeassistant.components.media_player as media_player -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( DOMAIN as DOMAIN_MP, SERVICE_PLAY_MEDIA, ) diff --git a/tests/components/unifiprotect/test_media_player.py b/tests/components/unifiprotect/test_media_player.py index c78718e3c06..1679d17c96c 100644 --- a/tests/components/unifiprotect/test_media_player.py +++ b/tests/components/unifiprotect/test_media_player.py @@ -8,7 +8,7 @@ import pytest from pyunifiprotect.data import Camera from pyunifiprotect.exceptions import StreamError -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_MEDIA_CONTENT_TYPE, ATTR_MEDIA_VOLUME_LEVEL, ) diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py index 059a19caf45..a949cd76d59 100644 --- a/tests/components/universal/test_media_player.py +++ b/tests/components/universal/test_media_player.py @@ -9,7 +9,7 @@ from homeassistant import config as hass_config import homeassistant.components.input_number as input_number import homeassistant.components.input_select as input_select import homeassistant.components.media_player as media_player -from homeassistant.components.media_player.const import MediaPlayerEntityFeature +from homeassistant.components.media_player import MediaPlayerEntityFeature import homeassistant.components.switch as switch import homeassistant.components.universal.media_player as universal from homeassistant.const import ( diff --git a/tests/components/venstar/test_climate.py b/tests/components/venstar/test_climate.py index 15b5d4df7b5..b544853b76d 100644 --- a/tests/components/venstar/test_climate.py +++ b/tests/components/venstar/test_climate.py @@ -1,7 +1,7 @@ """The climate tests for the venstar integration.""" from unittest.mock import patch -from homeassistant.components.climate.const import ClimateEntityFeature +from homeassistant.components.climate import ClimateEntityFeature from .util import async_init_integration, mock_venstar_devices diff --git a/tests/components/venstar/util.py b/tests/components/venstar/util.py index aa53a9c0a8d..23e480272d0 100644 --- a/tests/components/venstar/util.py +++ b/tests/components/venstar/util.py @@ -2,7 +2,7 @@ import requests_mock -from homeassistant.components.climate.const import DOMAIN +from homeassistant.components.climate import DOMAIN from homeassistant.const import CONF_HOST, CONF_PLATFORM from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component diff --git a/tests/components/vera/test_climate.py b/tests/components/vera/test_climate.py index c4e10c6a420..9e5c4b607fe 100644 --- a/tests/components/vera/test_climate.py +++ b/tests/components/vera/test_climate.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock import pyvera as pv -from homeassistant.components.climate.const import FAN_AUTO, FAN_ON, HVACMode +from homeassistant.components.climate import FAN_AUTO, FAN_ON, HVACMode from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config diff --git a/tests/components/vizio/test_media_player.py b/tests/components/vizio/test_media_player.py index 1c637733927..2a5a2acacd1 100644 --- a/tests/components/vizio/test_media_player.py +++ b/tests/components/vizio/test_media_player.py @@ -21,6 +21,7 @@ import voluptuous as vol from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, + ATTR_INPUT_SOURCE_LIST, ATTR_MEDIA_VOLUME_LEVEL, ATTR_MEDIA_VOLUME_MUTED, ATTR_SOUND_MODE, @@ -37,7 +38,6 @@ from homeassistant.components.media_player import ( SERVICE_VOLUME_UP, MediaPlayerDeviceClass, ) -from homeassistant.components.media_player.const import ATTR_INPUT_SOURCE_LIST from homeassistant.components.vizio import validate_apps from homeassistant.components.vizio.const import ( CONF_ADDITIONAL_CONFIGS, diff --git a/tests/components/voicerss/test_tts.py b/tests/components/voicerss/test_tts.py index 099b280625f..2af43cf988f 100644 --- a/tests/components/voicerss/test_tts.py +++ b/tests/components/voicerss/test_tts.py @@ -7,7 +7,7 @@ import shutil import pytest from homeassistant.components import media_source, tts -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_MEDIA_CONTENT_ID, DOMAIN as DOMAIN_MP, SERVICE_PLAY_MEDIA, diff --git a/tests/components/whirlpool/test_climate.py b/tests/components/whirlpool/test_climate.py index f0d4c93f8d6..26dcd5dbf9f 100644 --- a/tests/components/whirlpool/test_climate.py +++ b/tests/components/whirlpool/test_climate.py @@ -5,7 +5,7 @@ from attr import dataclass import pytest import whirlpool -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_HUMIDITY, ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, diff --git a/tests/components/ws66i/test_media_player.py b/tests/components/ws66i/test_media_player.py index fbe6a7b2782..652c6a90346 100644 --- a/tests/components/ws66i/test_media_player.py +++ b/tests/components/ws66i/test_media_player.py @@ -2,13 +2,13 @@ from collections import defaultdict from unittest.mock import patch -from homeassistant.components.media_player import MediaPlayerEntityFeature -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE_LIST, ATTR_MEDIA_VOLUME_LEVEL, DOMAIN as MEDIA_PLAYER_DOMAIN, SERVICE_SELECT_SOURCE, + MediaPlayerEntityFeature, ) from homeassistant.components.ws66i.const import ( CONF_SOURCES, diff --git a/tests/components/yandextts/test_tts.py b/tests/components/yandextts/test_tts.py index 8549b51c341..ffa9579f577 100644 --- a/tests/components/yandextts/test_tts.py +++ b/tests/components/yandextts/test_tts.py @@ -7,7 +7,7 @@ import shutil import pytest from homeassistant.components import media_source, tts -from homeassistant.components.media_player.const import ( +from homeassistant.components.media_player import ( ATTR_MEDIA_CONTENT_ID, DOMAIN as DOMAIN_MP, SERVICE_PLAY_MEDIA, diff --git a/tests/components/zha/test_climate.py b/tests/components/zha/test_climate.py index a04b2c116e3..f1b900400ea 100644 --- a/tests/components/zha/test_climate.py +++ b/tests/components/zha/test_climate.py @@ -10,7 +10,7 @@ import zigpy.zcl.clusters from zigpy.zcl.clusters.hvac import Thermostat import zigpy.zcl.foundation as zcl_f -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, ATTR_FAN_MODES, diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py index 0d633720639..ed7c23aef79 100644 --- a/tests/components/zwave_js/test_api.py +++ b/tests/components/zwave_js/test_api.py @@ -30,10 +30,7 @@ from zwave_js_server.model.controller import ( ) from zwave_js_server.model.node import Node -from homeassistant.components.websocket_api.const import ( - ERR_INVALID_FORMAT, - ERR_NOT_FOUND, -) +from homeassistant.components.websocket_api import ERR_INVALID_FORMAT, ERR_NOT_FOUND from homeassistant.components.zwave_js.api import ( ADDITIONAL_PROPERTIES, APPLICATION_VERSION, diff --git a/tests/components/zwave_js/test_climate.py b/tests/components/zwave_js/test_climate.py index a8b19b4d5cf..e0b8dbe569f 100644 --- a/tests/components/zwave_js/test_climate.py +++ b/tests/components/zwave_js/test_climate.py @@ -2,7 +2,7 @@ import pytest from zwave_js_server.event import Event -from homeassistant.components.climate.const import ( +from homeassistant.components.climate import ( ATTR_CURRENT_HUMIDITY, ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE,