From ae6d9c229e910b2802711c4d7575c076649d08d7 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Wed, 5 Jan 2022 18:21:20 +0100 Subject: [PATCH] Use const imports [l-z] (#63469) --- homeassistant/components/lcn/schemas.py | 4 ++-- homeassistant/components/light/intent.py | 3 +-- homeassistant/components/logi_circle/camera.py | 3 ++- homeassistant/components/mqtt/vacuum/schema_state.py | 9 ++++++--- homeassistant/components/neato/vacuum.py | 4 +--- homeassistant/components/roomba/irobot_base.py | 3 +-- homeassistant/components/shelly/binary_sensor.py | 2 +- homeassistant/components/slide/cover.py | 11 ++--------- homeassistant/components/surepetcare/lock.py | 3 ++- homeassistant/components/switch/light.py | 6 ++++-- homeassistant/components/tradfri/__init__.py | 3 +-- homeassistant/components/tradfri/config_flow.py | 2 +- homeassistant/components/tts/notify.py | 4 ++-- homeassistant/components/tuya/vacuum.py | 3 +-- .../components/water_heater/reproduce_state.py | 2 +- 15 files changed, 28 insertions(+), 34 deletions(-) diff --git a/homeassistant/components/lcn/schemas.py b/homeassistant/components/lcn/schemas.py index 5244bac3b6b3..290f7dd55f4b 100644 --- a/homeassistant/components/lcn/schemas.py +++ b/homeassistant/components/lcn/schemas.py @@ -17,6 +17,8 @@ from homeassistant.const import ( CONF_SWITCHES, CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME, + TEMP_CELSIUS, + TEMP_FAHRENHEIT, ) import homeassistant.helpers.config_validation as cv @@ -49,8 +51,6 @@ from .const import ( RELAY_PORTS, S0_INPUTS, SETPOINTS, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, THRESHOLDS, VAR_UNITS, VARIABLES, diff --git a/homeassistant/components/light/intent.py b/homeassistant/components/light/intent.py index 25475ca0cb54..261cbbd973d0 100644 --- a/homeassistant/components/light/intent.py +++ b/homeassistant/components/light/intent.py @@ -1,7 +1,7 @@ """Intents for the light integration.""" import voluptuous as vol -from homeassistant.const import ATTR_ENTITY_ID +from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON from homeassistant.core import HomeAssistant, State from homeassistant.helpers import intent import homeassistant.helpers.config_validation as cv @@ -12,7 +12,6 @@ from . import ( ATTR_RGB_COLOR, ATTR_SUPPORTED_COLOR_MODES, DOMAIN, - SERVICE_TURN_ON, brightness_supported, color_supported, ) diff --git a/homeassistant/components/logi_circle/camera.py b/homeassistant/components/logi_circle/camera.py index 548d4eec80f6..896d58753fd1 100644 --- a/homeassistant/components/logi_circle/camera.py +++ b/homeassistant/components/logi_circle/camera.py @@ -4,13 +4,14 @@ from __future__ import annotations from datetime import timedelta import logging -from homeassistant.components.camera import ATTR_ENTITY_ID, SUPPORT_ON_OFF, Camera +from homeassistant.components.camera import SUPPORT_ON_OFF, Camera from homeassistant.components.ffmpeg import get_ffmpeg_manager from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL, + ATTR_ENTITY_ID, STATE_OFF, STATE_ON, ) diff --git a/homeassistant/components/mqtt/vacuum/schema_state.py b/homeassistant/components/mqtt/vacuum/schema_state.py index 2658741b574a..872f4d62765a 100644 --- a/homeassistant/components/mqtt/vacuum/schema_state.py +++ b/homeassistant/components/mqtt/vacuum/schema_state.py @@ -8,8 +8,6 @@ from homeassistant.components.vacuum import ( STATE_CLEANING, STATE_DOCKED, STATE_ERROR, - STATE_IDLE, - STATE_PAUSED, STATE_RETURNING, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, @@ -23,7 +21,12 @@ from homeassistant.components.vacuum import ( SUPPORT_STOP, StateVacuumEntity, ) -from homeassistant.const import ATTR_SUPPORTED_FEATURES, CONF_NAME +from homeassistant.const import ( + ATTR_SUPPORTED_FEATURES, + CONF_NAME, + STATE_IDLE, + STATE_PAUSED, +) from homeassistant.core import callback import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/neato/vacuum.py b/homeassistant/components/neato/vacuum.py index 5ffc59068ae0..c40509c7556b 100644 --- a/homeassistant/components/neato/vacuum.py +++ b/homeassistant/components/neato/vacuum.py @@ -14,8 +14,6 @@ from homeassistant.components.vacuum import ( STATE_CLEANING, STATE_DOCKED, STATE_ERROR, - STATE_IDLE, - STATE_PAUSED, STATE_RETURNING, SUPPORT_BATTERY, SUPPORT_CLEAN_SPOT, @@ -29,7 +27,7 @@ from homeassistant.components.vacuum import ( StateVacuumEntity, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_MODE +from homeassistant.const import ATTR_MODE, STATE_IDLE, STATE_PAUSED from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv, entity_platform from homeassistant.helpers.entity import DeviceInfo diff --git a/homeassistant/components/roomba/irobot_base.py b/homeassistant/components/roomba/irobot_base.py index fd33f850bd7d..d7e3266f5fa1 100644 --- a/homeassistant/components/roomba/irobot_base.py +++ b/homeassistant/components/roomba/irobot_base.py @@ -9,8 +9,6 @@ from homeassistant.components.vacuum import ( STATE_CLEANING, STATE_DOCKED, STATE_ERROR, - STATE_IDLE, - STATE_PAUSED, STATE_RETURNING, SUPPORT_BATTERY, SUPPORT_LOCATE, @@ -23,6 +21,7 @@ from homeassistant.components.vacuum import ( SUPPORT_STOP, StateVacuumEntity, ) +from homeassistant.const import STATE_IDLE, STATE_PAUSED import homeassistant.helpers.device_registry as dr from homeassistant.helpers.entity import DeviceInfo, Entity import homeassistant.util.dt as dt_util diff --git a/homeassistant/components/shelly/binary_sensor.py b/homeassistant/components/shelly/binary_sensor.py index 069e6a9839c6..c266e88adc05 100644 --- a/homeassistant/components/shelly/binary_sensor.py +++ b/homeassistant/components/shelly/binary_sensor.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import Final, cast from homeassistant.components.binary_sensor import ( - STATE_ON, BinarySensorDeviceClass, BinarySensorEntity, ) from homeassistant.config_entries import ConfigEntry +from homeassistant.const import STATE_ON from homeassistant.core import HomeAssistant from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/slide/cover.py b/homeassistant/components/slide/cover.py index a0d74a3081a1..7841be509771 100644 --- a/homeassistant/components/slide/cover.py +++ b/homeassistant/components/slide/cover.py @@ -3,15 +3,8 @@ from __future__ import annotations import logging -from homeassistant.components.cover import ( - ATTR_POSITION, - STATE_CLOSED, - STATE_CLOSING, - STATE_OPENING, - CoverDeviceClass, - CoverEntity, -) -from homeassistant.const import ATTR_ID +from homeassistant.components.cover import ATTR_POSITION, CoverDeviceClass, CoverEntity +from homeassistant.const import ATTR_ID, STATE_CLOSED, STATE_CLOSING, STATE_OPENING from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType diff --git a/homeassistant/components/surepetcare/lock.py b/homeassistant/components/surepetcare/lock.py index bb55514409aa..8ebdd9958f05 100644 --- a/homeassistant/components/surepetcare/lock.py +++ b/homeassistant/components/surepetcare/lock.py @@ -6,8 +6,9 @@ from typing import Any from surepy.entities import SurepyEntity from surepy.enums import EntityType, LockState -from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED, LockEntity +from homeassistant.components.lock import LockEntity from homeassistant.config_entries import ConfigEntry +from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/switch/light.py b/homeassistant/components/switch/light.py index 2a83a767cc09..32c0aff74fa7 100644 --- a/homeassistant/components/switch/light.py +++ b/homeassistant/components/switch/light.py @@ -15,6 +15,8 @@ from homeassistant.const import ( ATTR_ENTITY_ID, CONF_ENTITY_ID, CONF_NAME, + SERVICE_TURN_OFF, + SERVICE_TURN_ON, STATE_ON, STATE_UNAVAILABLE, ) @@ -74,7 +76,7 @@ class LightSwitch(LightEntity): """Forward the turn_on command to the switch in this light switch.""" await self.hass.services.async_call( switch.DOMAIN, - switch.SERVICE_TURN_ON, + SERVICE_TURN_ON, {ATTR_ENTITY_ID: self._switch_entity_id}, blocking=True, context=self._context, @@ -84,7 +86,7 @@ class LightSwitch(LightEntity): """Forward the turn_off command to the switch in this light switch.""" await self.hass.services.async_call( switch.DOMAIN, - switch.SERVICE_TURN_OFF, + SERVICE_TURN_OFF, {ATTR_ENTITY_ID: self._switch_entity_id}, blocking=True, context=self._context, diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py index f207bb25be65..952ee54a0d8c 100644 --- a/homeassistant/components/tradfri/__init__.py +++ b/homeassistant/components/tradfri/__init__.py @@ -11,7 +11,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.config_entries import ConfigEntry -from homeassistant.const import EVENT_HOMEASSISTANT_STOP +from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_STOP from homeassistant.core import Event, HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady import homeassistant.helpers.config_validation as cv @@ -25,7 +25,6 @@ from .const import ( ATTR_TRADFRI_MANUFACTURER, CONF_ALLOW_TRADFRI_GROUPS, CONF_GATEWAY_ID, - CONF_HOST, CONF_IDENTITY, CONF_IMPORT_GROUPS, CONF_KEY, diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py index a0b63f94f4fc..d39eef864be0 100644 --- a/homeassistant/components/tradfri/config_flow.py +++ b/homeassistant/components/tradfri/config_flow.py @@ -12,12 +12,12 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import zeroconf +from homeassistant.const import CONF_HOST from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResult from .const import ( CONF_GATEWAY_ID, - CONF_HOST, CONF_IDENTITY, CONF_IMPORT_GROUPS, CONF_KEY, diff --git a/homeassistant/components/tts/notify.py b/homeassistant/components/tts/notify.py index ce978c9b9676..c53788f89b89 100644 --- a/homeassistant/components/tts/notify.py +++ b/homeassistant/components/tts/notify.py @@ -4,11 +4,11 @@ import logging import voluptuous as vol from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService -from homeassistant.const import CONF_NAME +from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME from homeassistant.core import split_entity_id import homeassistant.helpers.config_validation as cv -from . import ATTR_ENTITY_ID, ATTR_LANGUAGE, ATTR_MESSAGE, DOMAIN +from . import ATTR_LANGUAGE, ATTR_MESSAGE, DOMAIN CONF_MEDIA_PLAYER = "media_player" CONF_TTS_SERVICE = "tts_service" diff --git a/homeassistant/components/tuya/vacuum.py b/homeassistant/components/tuya/vacuum.py index 4fc90b88ac08..73731efb9e9f 100644 --- a/homeassistant/components/tuya/vacuum.py +++ b/homeassistant/components/tuya/vacuum.py @@ -8,8 +8,6 @@ from tuya_iot import TuyaDevice, TuyaDeviceManager from homeassistant.components.vacuum import ( STATE_CLEANING, STATE_DOCKED, - STATE_IDLE, - STATE_PAUSED, STATE_RETURNING, SUPPORT_BATTERY, SUPPORT_FAN_SPEED, @@ -25,6 +23,7 @@ from homeassistant.components.vacuum import ( StateVacuumEntity, ) from homeassistant.config_entries import ConfigEntry +from homeassistant.const import STATE_IDLE, STATE_PAUSED from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/homeassistant/components/water_heater/reproduce_state.py b/homeassistant/components/water_heater/reproduce_state.py index 5fbe3f935f8d..b3be0f622731 100644 --- a/homeassistant/components/water_heater/reproduce_state.py +++ b/homeassistant/components/water_heater/reproduce_state.py @@ -8,6 +8,7 @@ from typing import Any from homeassistant.const import ( ATTR_ENTITY_ID, + ATTR_TEMPERATURE, SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_OFF, @@ -18,7 +19,6 @@ from homeassistant.core import Context, HomeAssistant, State from . import ( ATTR_AWAY_MODE, ATTR_OPERATION_MODE, - ATTR_TEMPERATURE, DOMAIN, SERVICE_SET_AWAY_MODE, SERVICE_SET_OPERATION_MODE,