diff --git a/homeassistant/components/airvisual/__init__.py b/homeassistant/components/airvisual/__init__.py index e07400f2764..1d5babee6d7 100644 --- a/homeassistant/components/airvisual/__init__.py +++ b/homeassistant/components/airvisual/__init__.py @@ -19,6 +19,7 @@ from homeassistant.components import automation from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry from homeassistant.const import ( CONF_API_KEY, + CONF_COUNTRY, CONF_IP_ADDRESS, CONF_LATITUDE, CONF_LONGITUDE, @@ -44,7 +45,6 @@ from homeassistant.helpers.update_coordinator import ( from .const import ( CONF_CITY, - CONF_COUNTRY, CONF_GEOGRAPHIES, CONF_INTEGRATION_TYPE, DOMAIN, diff --git a/homeassistant/components/airvisual/config_flow.py b/homeassistant/components/airvisual/config_flow.py index 893726fc022..23a26e2cca6 100644 --- a/homeassistant/components/airvisual/config_flow.py +++ b/homeassistant/components/airvisual/config_flow.py @@ -19,6 +19,7 @@ from homeassistant import config_entries from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_API_KEY, + CONF_COUNTRY, CONF_LATITUDE, CONF_LONGITUDE, CONF_SHOW_ON_MAP, @@ -35,7 +36,6 @@ from homeassistant.helpers.schema_config_entry_flow import ( from . import async_get_geography_id from .const import ( CONF_CITY, - CONF_COUNTRY, CONF_INTEGRATION_TYPE, DOMAIN, INTEGRATION_TYPE_GEOGRAPHY_COORDS, diff --git a/homeassistant/components/airvisual/const.py b/homeassistant/components/airvisual/const.py index 8e2c08eb896..0afa7d32d41 100644 --- a/homeassistant/components/airvisual/const.py +++ b/homeassistant/components/airvisual/const.py @@ -9,6 +9,5 @@ INTEGRATION_TYPE_GEOGRAPHY_NAME = "Geographical Location by Name" INTEGRATION_TYPE_NODE_PRO = "AirVisual Node/Pro" CONF_CITY = "city" -CONF_COUNTRY = "country" CONF_GEOGRAPHIES = "geographies" CONF_INTEGRATION_TYPE = "integration_type" diff --git a/homeassistant/components/airvisual/diagnostics.py b/homeassistant/components/airvisual/diagnostics.py index c273dbe7a55..05e716367bb 100644 --- a/homeassistant/components/airvisual/diagnostics.py +++ b/homeassistant/components/airvisual/diagnostics.py @@ -7,6 +7,7 @@ from homeassistant.components.diagnostics import async_redact_data from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_API_KEY, + CONF_COUNTRY, CONF_LATITUDE, CONF_LONGITUDE, CONF_STATE, @@ -15,7 +16,7 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator -from .const import CONF_CITY, CONF_COUNTRY, DOMAIN +from .const import CONF_CITY, DOMAIN CONF_COORDINATES = "coordinates" CONF_TITLE = "title" diff --git a/homeassistant/components/airvisual/sensor.py b/homeassistant/components/airvisual/sensor.py index 1f0c5aa1baa..ab80e154903 100644 --- a/homeassistant/components/airvisual/sensor.py +++ b/homeassistant/components/airvisual/sensor.py @@ -15,6 +15,7 @@ from homeassistant.const import ( CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONCENTRATION_PARTS_PER_BILLION, CONCENTRATION_PARTS_PER_MILLION, + CONF_COUNTRY, CONF_LATITUDE, CONF_LONGITUDE, CONF_SHOW_ON_MAP, @@ -25,7 +26,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import DataUpdateCoordinator from . import AirVisualEntity -from .const import CONF_CITY, CONF_COUNTRY, DOMAIN +from .const import CONF_CITY, DOMAIN ATTR_CITY = "city" ATTR_COUNTRY = "country" diff --git a/homeassistant/components/amberelectric/const.py b/homeassistant/components/amberelectric/const.py index f3cda887150..5f92e5a9117 100644 --- a/homeassistant/components/amberelectric/const.py +++ b/homeassistant/components/amberelectric/const.py @@ -4,7 +4,6 @@ import logging from homeassistant.const import Platform DOMAIN = "amberelectric" -CONF_API_TOKEN = "api_token" CONF_SITE_NAME = "site_name" CONF_SITE_ID = "site_id" CONF_SITE_NMI = "site_nmi" diff --git a/homeassistant/components/blink/const.py b/homeassistant/components/blink/const.py index 64b05e1ba27..d394b5c0008 100644 --- a/homeassistant/components/blink/const.py +++ b/homeassistant/components/blink/const.py @@ -7,7 +7,6 @@ DEVICE_ID = "Home Assistant" CONF_MIGRATE = "migrate" CONF_CAMERA = "camera" CONF_ALARM_CONTROL_PANEL = "alarm_control_panel" -CONF_DEVICE_ID = "device_id" DEFAULT_BRAND = "Blink" DEFAULT_ATTRIBUTION = "Data provided by immedia-semi.com" DEFAULT_SCAN_INTERVAL = 300 diff --git a/homeassistant/components/braviatv/config_flow.py b/homeassistant/components/braviatv/config_flow.py index 3fb6e6b3b40..fd72203b249 100644 --- a/homeassistant/components/braviatv/config_flow.py +++ b/homeassistant/components/braviatv/config_flow.py @@ -12,7 +12,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import ssdp from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PIN +from homeassistant.const import CONF_CLIENT_ID, CONF_HOST, CONF_MAC, CONF_NAME, CONF_PIN from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import instance_id from homeassistant.helpers.aiohttp_client import async_create_clientsession @@ -22,7 +22,6 @@ from .const import ( ATTR_CID, ATTR_MAC, ATTR_MODEL, - CONF_CLIENT_ID, CONF_NICKNAME, CONF_USE_PSK, DOMAIN, diff --git a/homeassistant/components/braviatv/const.py b/homeassistant/components/braviatv/const.py index 34b621802f9..aff02aa9e8b 100644 --- a/homeassistant/components/braviatv/const.py +++ b/homeassistant/components/braviatv/const.py @@ -9,7 +9,6 @@ ATTR_MAC: Final = "macAddr" ATTR_MANUFACTURER: Final = "Sony" ATTR_MODEL: Final = "model" -CONF_CLIENT_ID: Final = "client_id" CONF_NICKNAME: Final = "nickname" CONF_USE_PSK: Final = "use_psk" diff --git a/homeassistant/components/braviatv/coordinator.py b/homeassistant/components/braviatv/coordinator.py index 20b30d1dd11..43f911cd3a2 100644 --- a/homeassistant/components/braviatv/coordinator.py +++ b/homeassistant/components/braviatv/coordinator.py @@ -19,14 +19,13 @@ from pybravia import ( ) from homeassistant.components.media_player import MediaType -from homeassistant.const import CONF_PIN +from homeassistant.const import CONF_CLIENT_ID, CONF_PIN from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed from homeassistant.helpers.debounce import Debouncer from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from .const import ( - CONF_CLIENT_ID, CONF_NICKNAME, CONF_USE_PSK, DOMAIN, diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py index b78157588e8..b633e1ae620 100644 --- a/homeassistant/components/elkm1/__init__.py +++ b/homeassistant/components/elkm1/__init__.py @@ -17,6 +17,7 @@ import voluptuous as vol from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry from homeassistant.const import ( ATTR_CONNECTIONS, + CONF_ENABLED, CONF_EXCLUDE, CONF_HOST, CONF_INCLUDE, @@ -46,7 +47,6 @@ from .const import ( CONF_AREA, CONF_AUTO_CONFIGURE, CONF_COUNTER, - CONF_ENABLED, CONF_KEYPAD, CONF_OUTPUT, CONF_PLC, diff --git a/homeassistant/components/elkm1/const.py b/homeassistant/components/elkm1/const.py index a2bb5744c11..9e952c7ee0b 100644 --- a/homeassistant/components/elkm1/const.py +++ b/homeassistant/components/elkm1/const.py @@ -14,7 +14,6 @@ LOGIN_TIMEOUT = 20 CONF_AUTO_CONFIGURE = "auto_configure" CONF_AREA = "area" CONF_COUNTER = "counter" -CONF_ENABLED = "enabled" CONF_KEYPAD = "keypad" CONF_OUTPUT = "output" CONF_PLC = "plc" diff --git a/homeassistant/components/github/config_flow.py b/homeassistant/components/github/config_flow.py index 9afbf80297c..5e223483e2e 100644 --- a/homeassistant/components/github/config_flow.py +++ b/homeassistant/components/github/config_flow.py @@ -15,6 +15,7 @@ from aiogithubapi.const import OAUTH_USER_LOGIN import voluptuous as vol from homeassistant import config_entries +from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.core import HomeAssistant, callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.aiohttp_client import ( @@ -23,14 +24,7 @@ from homeassistant.helpers.aiohttp_client import ( ) import homeassistant.helpers.config_validation as cv -from .const import ( - CLIENT_ID, - CONF_ACCESS_TOKEN, - CONF_REPOSITORIES, - DEFAULT_REPOSITORIES, - DOMAIN, - LOGGER, -) +from .const import CLIENT_ID, CONF_REPOSITORIES, DEFAULT_REPOSITORIES, DOMAIN, LOGGER async def get_repositories(hass: HomeAssistant, access_token: str) -> list[str]: diff --git a/homeassistant/components/github/const.py b/homeassistant/components/github/const.py index a186f4684b3..d01656ee8ae 100644 --- a/homeassistant/components/github/const.py +++ b/homeassistant/components/github/const.py @@ -13,7 +13,6 @@ CLIENT_ID = "1440cafcc86e3ea5d6a2" DEFAULT_REPOSITORIES = ["home-assistant/core", "esphome/esphome"] FALLBACK_UPDATE_INTERVAL = timedelta(hours=1, minutes=30) -CONF_ACCESS_TOKEN = "access_token" CONF_REPOSITORIES = "repositories" diff --git a/homeassistant/components/github/diagnostics.py b/homeassistant/components/github/diagnostics.py index c2546d636b8..15626497344 100644 --- a/homeassistant/components/github/diagnostics.py +++ b/homeassistant/components/github/diagnostics.py @@ -6,13 +6,14 @@ from typing import Any from aiogithubapi import GitHubAPI, GitHubException from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import ( SERVER_SOFTWARE, async_get_clientsession, ) -from .const import CONF_ACCESS_TOKEN, DOMAIN +from .const import DOMAIN from .coordinator import GitHubDataUpdateCoordinator diff --git a/homeassistant/components/homewizard/const.py b/homeassistant/components/homewizard/const.py index d4692ee8bf0..daeed9d3505 100644 --- a/homeassistant/components/homewizard/const.py +++ b/homeassistant/components/homewizard/const.py @@ -17,7 +17,6 @@ LOGGER = logging.getLogger(__package__) # Platform config. CONF_API_ENABLED = "api_enabled" CONF_DATA = "data" -CONF_DEVICE = "device" CONF_PATH = "path" CONF_PRODUCT_NAME = "product_name" CONF_PRODUCT_TYPE = "product_type" diff --git a/homeassistant/components/hue/bridge.py b/homeassistant/components/hue/bridge.py index 04bd63e5b1f..c5ceebec3f8 100644 --- a/homeassistant/components/hue/bridge.py +++ b/homeassistant/components/hue/bridge.py @@ -13,11 +13,11 @@ from aiohue.errors import AiohueException, BridgeBusy from homeassistant import core from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry -from homeassistant.const import CONF_API_KEY, CONF_HOST, Platform +from homeassistant.const import CONF_API_KEY, CONF_API_VERSION, CONF_HOST, Platform from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError from homeassistant.helpers import aiohttp_client -from .const import CONF_API_VERSION, DOMAIN +from .const import DOMAIN from .v1.sensor_base import SensorManager from .v2.device import async_setup_devices from .v2.hue_event import async_setup_hue_events diff --git a/homeassistant/components/hue/config_flow.py b/homeassistant/components/hue/config_flow.py index 0957329abb0..7262dea39ef 100644 --- a/homeassistant/components/hue/config_flow.py +++ b/homeassistant/components/hue/config_flow.py @@ -14,7 +14,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import zeroconf -from homeassistant.const import CONF_API_KEY, CONF_HOST +from homeassistant.const import CONF_API_KEY, CONF_API_VERSION, CONF_HOST from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import ( @@ -26,7 +26,6 @@ from homeassistant.helpers import ( from .const import ( CONF_ALLOW_HUE_GROUPS, CONF_ALLOW_UNREACHABLE, - CONF_API_VERSION, CONF_IGNORE_AVAILABILITY, DEFAULT_ALLOW_HUE_GROUPS, DEFAULT_ALLOW_UNREACHABLE, diff --git a/homeassistant/components/hue/const.py b/homeassistant/components/hue/const.py index 38c2587bc1a..5033aaa427a 100644 --- a/homeassistant/components/hue/const.py +++ b/homeassistant/components/hue/const.py @@ -7,7 +7,6 @@ from aiohue.v2.models.relative_rotary import ( DOMAIN = "hue" -CONF_API_VERSION = "api_version" CONF_IGNORE_AVAILABILITY = "ignore_availability" CONF_SUBTYPE = "subtype" diff --git a/homeassistant/components/hue/migration.py b/homeassistant/components/hue/migration.py index 035da145cc0..f4bf6366d61 100644 --- a/homeassistant/components/hue/migration.py +++ b/homeassistant/components/hue/migration.py @@ -11,7 +11,7 @@ from homeassistant import core from homeassistant.components.binary_sensor import BinarySensorDeviceClass from homeassistant.components.sensor import SensorDeviceClass from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_USERNAME +from homeassistant.const import CONF_API_KEY, CONF_API_VERSION, CONF_HOST, CONF_USERNAME from homeassistant.helpers import aiohttp_client from homeassistant.helpers.device_registry import ( async_entries_for_config_entry as devices_for_config_entries, @@ -23,7 +23,7 @@ from homeassistant.helpers.entity_registry import ( async_get as async_get_entity_registry, ) -from .const import CONF_API_VERSION, DOMAIN +from .const import DOMAIN LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/mysensors/config_flow.py b/homeassistant/components/mysensors/config_flow.py index 8011bfcb155..fdf056c6c06 100644 --- a/homeassistant/components/mysensors/config_flow.py +++ b/homeassistant/components/mysensors/config_flow.py @@ -18,6 +18,7 @@ from homeassistant.components.mqtt import ( valid_subscribe_topic, ) from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_DEVICE from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import selector @@ -25,7 +26,6 @@ import homeassistant.helpers.config_validation as cv from .const import ( CONF_BAUD_RATE, - CONF_DEVICE, CONF_GATEWAY_TYPE, CONF_GATEWAY_TYPE_MQTT, CONF_GATEWAY_TYPE_SERIAL, diff --git a/homeassistant/components/mysensors/const.py b/homeassistant/components/mysensors/const.py index a5c82c32b55..0a4b4c090ef 100644 --- a/homeassistant/components/mysensors/const.py +++ b/homeassistant/components/mysensors/const.py @@ -11,7 +11,6 @@ ATTR_GATEWAY_ID: Final = "gateway_id" ATTR_NODE_ID: Final = "node_id" CONF_BAUD_RATE: Final = "baud_rate" -CONF_DEVICE: Final = "device" CONF_PERSISTENCE_FILE: Final = "persistence_file" CONF_RETAIN: Final = "retain" CONF_TCP_PORT: Final = "tcp_port" diff --git a/homeassistant/components/mysensors/device.py b/homeassistant/components/mysensors/device.py index 6d7decf14f4..c70ef1f89ed 100644 --- a/homeassistant/components/mysensors/device.py +++ b/homeassistant/components/mysensors/device.py @@ -8,7 +8,13 @@ from typing import Any from mysensors import BaseAsyncGateway, Sensor from mysensors.sensor import ChildSensor -from homeassistant.const import ATTR_BATTERY_LEVEL, STATE_OFF, STATE_ON, Platform +from homeassistant.const import ( + ATTR_BATTERY_LEVEL, + CONF_DEVICE, + STATE_OFF, + STATE_ON, + Platform, +) from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.debounce import Debouncer from homeassistant.helpers.device_registry import DeviceInfo @@ -17,7 +23,6 @@ from homeassistant.helpers.entity import Entity from .const import ( CHILD_CALLBACK, - CONF_DEVICE, DOMAIN, NODE_CALLBACK, PLATFORM_TYPES, diff --git a/homeassistant/components/mysensors/gateway.py b/homeassistant/components/mysensors/gateway.py index 590ad41d6a2..0818d68de2b 100644 --- a/homeassistant/components/mysensors/gateway.py +++ b/homeassistant/components/mysensors/gateway.py @@ -18,14 +18,13 @@ from homeassistant.components.mqtt import ( ReceivePayloadType, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import EVENT_HOMEASSISTANT_STOP +from homeassistant.const import CONF_DEVICE, EVENT_HOMEASSISTANT_STOP from homeassistant.core import Event, HomeAssistant, callback import homeassistant.helpers.config_validation as cv from homeassistant.util.unit_system import METRIC_SYSTEM from .const import ( CONF_BAUD_RATE, - CONF_DEVICE, CONF_GATEWAY_TYPE, CONF_GATEWAY_TYPE_MQTT, CONF_GATEWAY_TYPE_SERIAL, diff --git a/homeassistant/components/prosegur/__init__.py b/homeassistant/components/prosegur/__init__.py index 9f594fc6dae..fd79a091e39 100644 --- a/homeassistant/components/prosegur/__init__.py +++ b/homeassistant/components/prosegur/__init__.py @@ -4,12 +4,12 @@ import logging from pyprosegur.auth import Auth from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform +from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import aiohttp_client -from .const import CONF_COUNTRY, DOMAIN +from .const import DOMAIN PLATFORMS = [Platform.ALARM_CONTROL_PANEL, Platform.CAMERA] diff --git a/homeassistant/components/prosegur/config_flow.py b/homeassistant/components/prosegur/config_flow.py index ac2b704b012..c28245a09ff 100644 --- a/homeassistant/components/prosegur/config_flow.py +++ b/homeassistant/components/prosegur/config_flow.py @@ -9,11 +9,11 @@ import voluptuous as vol from homeassistant import config_entries, core, exceptions from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_PASSWORD, CONF_USERNAME +from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import aiohttp_client, selector -from .const import CONF_CONTRACT, CONF_COUNTRY, DOMAIN +from .const import CONF_CONTRACT, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/prosegur/const.py b/homeassistant/components/prosegur/const.py index ea823e76062..495bec5d4ca 100644 --- a/homeassistant/components/prosegur/const.py +++ b/homeassistant/components/prosegur/const.py @@ -2,7 +2,6 @@ DOMAIN = "prosegur" -CONF_COUNTRY = "country" CONF_CONTRACT = "contract" SERVICE_REQUEST_IMAGE = "request_image" diff --git a/homeassistant/components/samsungtv/bridge.py b/homeassistant/components/samsungtv/bridge.py index 03a9c35c9ba..f2767ce693e 100644 --- a/homeassistant/components/samsungtv/bridge.py +++ b/homeassistant/components/samsungtv/bridge.py @@ -34,6 +34,7 @@ from samsungtvws.remote import ChannelEmitCommand, SendRemoteKey from websockets.exceptions import ConnectionClosedError, WebSocketException from homeassistant.const import ( + CONF_DESCRIPTION, CONF_HOST, CONF_ID, CONF_METHOD, @@ -50,7 +51,6 @@ from homeassistant.helpers.device_registry import format_mac from homeassistant.util import dt as dt_util from .const import ( - CONF_DESCRIPTION, CONF_SESSION_ID, ENCRYPTED_WEBSOCKET_PORT, LEGACY_PORT, diff --git a/homeassistant/components/samsungtv/const.py b/homeassistant/components/samsungtv/const.py index 6699d26243b..6c657145d7a 100644 --- a/homeassistant/components/samsungtv/const.py +++ b/homeassistant/components/samsungtv/const.py @@ -11,7 +11,6 @@ DEFAULT_MANUFACTURER = "Samsung" VALUE_CONF_NAME = "HomeAssistant" VALUE_CONF_ID = "ha.component.samsung" -CONF_DESCRIPTION = "description" CONF_MANUFACTURER = "manufacturer" CONF_SSDP_RENDERING_CONTROL_LOCATION = "ssdp_rendering_control_location" CONF_SSDP_MAIN_TV_AGENT_LOCATION = "ssdp_main_tv_agent_location" diff --git a/homeassistant/components/subaru/__init__.py b/homeassistant/components/subaru/__init__.py index 091a281defc..8a22391284f 100644 --- a/homeassistant/components/subaru/__init__.py +++ b/homeassistant/components/subaru/__init__.py @@ -6,7 +6,13 @@ import time from subarulink import Controller as SubaruAPI, InvalidCredentials, SubaruException from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_PIN, CONF_USERNAME +from homeassistant.const import ( + CONF_COUNTRY, + CONF_DEVICE_ID, + CONF_PASSWORD, + CONF_PIN, + CONF_USERNAME, +) from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers import aiohttp_client @@ -14,7 +20,6 @@ from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from .const import ( - CONF_COUNTRY, CONF_UPDATE_ENABLED, COORDINATOR_NAME, DOMAIN, diff --git a/homeassistant/components/subaru/config_flow.py b/homeassistant/components/subaru/config_flow.py index 6d1d5015ed3..b21feab7843 100644 --- a/homeassistant/components/subaru/config_flow.py +++ b/homeassistant/components/subaru/config_flow.py @@ -15,12 +15,18 @@ from subarulink.const import COUNTRY_CAN, COUNTRY_USA import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_PIN, CONF_USERNAME +from homeassistant.const import ( + CONF_COUNTRY, + CONF_DEVICE_ID, + CONF_PASSWORD, + CONF_PIN, + CONF_USERNAME, +) from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import aiohttp_client, config_validation as cv -from .const import CONF_COUNTRY, CONF_UPDATE_ENABLED, DOMAIN +from .const import CONF_UPDATE_ENABLED, DOMAIN _LOGGER = logging.getLogger(__name__) CONF_CONTACT_METHOD = "contact_method" diff --git a/homeassistant/components/subaru/const.py b/homeassistant/components/subaru/const.py index 9c94ed35361..ab76c363f7e 100644 --- a/homeassistant/components/subaru/const.py +++ b/homeassistant/components/subaru/const.py @@ -7,7 +7,6 @@ DOMAIN = "subaru" FETCH_INTERVAL = 300 UPDATE_INTERVAL = 7200 CONF_UPDATE_ENABLED = "update_enabled" -CONF_COUNTRY = "country" # entry fields ENTRY_CONTROLLER = "controller" diff --git a/homeassistant/components/tplink/const.py b/homeassistant/components/tplink/const.py index b1cd323a36a..22b5741fceb 100644 --- a/homeassistant/components/tplink/const.py +++ b/homeassistant/components/tplink/const.py @@ -13,7 +13,6 @@ ATTR_TODAY_ENERGY_KWH: Final = "today_energy_kwh" ATTR_TOTAL_ENERGY_KWH: Final = "total_energy_kwh" CONF_DIMMER: Final = "dimmer" -CONF_DISCOVERY: Final = "discovery" CONF_LIGHT: Final = "light" CONF_STRIP: Final = "strip" CONF_SWITCH: Final = "switch" diff --git a/homeassistant/components/workday/__init__.py b/homeassistant/components/workday/__init__.py index 455f5d4618a..3000570731b 100644 --- a/homeassistant/components/workday/__init__.py +++ b/homeassistant/components/workday/__init__.py @@ -4,12 +4,12 @@ from __future__ import annotations from holidays import HolidayBase, country_holidays, list_supported_countries from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_LANGUAGE +from homeassistant.const import CONF_COUNTRY, CONF_LANGUAGE from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryError from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue -from .const import CONF_COUNTRY, CONF_PROVINCE, DOMAIN, PLATFORMS +from .const import CONF_PROVINCE, DOMAIN, PLATFORMS async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: diff --git a/homeassistant/components/workday/binary_sensor.py b/homeassistant/components/workday/binary_sensor.py index 2d1030c6b92..e2369baade5 100644 --- a/homeassistant/components/workday/binary_sensor.py +++ b/homeassistant/components/workday/binary_sensor.py @@ -13,7 +13,7 @@ import voluptuous as vol from homeassistant.components.binary_sensor import BinarySensorEntity from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_LANGUAGE, CONF_NAME +from homeassistant.const import CONF_COUNTRY, CONF_LANGUAGE, CONF_NAME from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse import homeassistant.helpers.config_validation as cv from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo @@ -26,7 +26,6 @@ from homeassistant.util import dt as dt_util from .const import ( ALLOWED_DAYS, CONF_ADD_HOLIDAYS, - CONF_COUNTRY, CONF_EXCLUDES, CONF_OFFSET, CONF_PROVINCE, diff --git a/homeassistant/components/workday/config_flow.py b/homeassistant/components/workday/config_flow.py index 9ae31977276..859d3710ca4 100644 --- a/homeassistant/components/workday/config_flow.py +++ b/homeassistant/components/workday/config_flow.py @@ -11,7 +11,7 @@ from homeassistant.config_entries import ( ConfigFlow, OptionsFlowWithConfigEntry, ) -from homeassistant.const import CONF_LANGUAGE, CONF_NAME +from homeassistant.const import CONF_COUNTRY, CONF_LANGUAGE, CONF_NAME from homeassistant.core import callback from homeassistant.data_entry_flow import AbortFlow, FlowResult from homeassistant.exceptions import HomeAssistantError @@ -33,7 +33,6 @@ from homeassistant.util import dt as dt_util from .const import ( ALLOWED_DAYS, CONF_ADD_HOLIDAYS, - CONF_COUNTRY, CONF_EXCLUDES, CONF_OFFSET, CONF_PROVINCE, diff --git a/homeassistant/components/workday/const.py b/homeassistant/components/workday/const.py index 20905fb9892..ad9375830dd 100644 --- a/homeassistant/components/workday/const.py +++ b/homeassistant/components/workday/const.py @@ -12,7 +12,6 @@ ALLOWED_DAYS = WEEKDAYS + ["holiday"] DOMAIN = "workday" PLATFORMS = [Platform.BINARY_SENSOR] -CONF_COUNTRY = "country" CONF_PROVINCE = "province" CONF_WORKDAYS = "workdays" CONF_EXCLUDES = "excludes" diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py index 3c316fd3f47..716d4a04fa7 100644 --- a/homeassistant/components/xiaomi_miio/__init__.py +++ b/homeassistant/components/xiaomi_miio/__init__.py @@ -35,7 +35,7 @@ from miio import ( from miio.gateway.gateway import GatewayException from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_TOKEN, Platform +from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN, Platform from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import device_registry as dr, entity_registry as er @@ -43,7 +43,6 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda from .const import ( ATTR_AVAILABLE, - CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, DOMAIN, diff --git a/homeassistant/components/xiaomi_miio/air_quality.py b/homeassistant/components/xiaomi_miio/air_quality.py index 30fcaa5152a..f9248ba5ff3 100644 --- a/homeassistant/components/xiaomi_miio/air_quality.py +++ b/homeassistant/components/xiaomi_miio/air_quality.py @@ -6,12 +6,11 @@ from miio import AirQualityMonitor, AirQualityMonitorCGDN1, DeviceException from homeassistant.components.air_quality import AirQualityEntity from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_TOKEN +from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, MODEL_AIRQUALITYMONITOR_B1, MODEL_AIRQUALITYMONITOR_CGDN1, diff --git a/homeassistant/components/xiaomi_miio/binary_sensor.py b/homeassistant/components/xiaomi_miio/binary_sensor.py index 051ac2ab778..130b5ebd922 100644 --- a/homeassistant/components/xiaomi_miio/binary_sensor.py +++ b/homeassistant/components/xiaomi_miio/binary_sensor.py @@ -11,13 +11,12 @@ from homeassistant.components.binary_sensor import ( BinarySensorEntityDescription, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_MODEL, EntityCategory +from homeassistant.const import CONF_DEVICE, CONF_MODEL, EntityCategory from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import VacuumCoordinatorDataAttributes from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, DOMAIN, KEY_COORDINATOR, diff --git a/homeassistant/components/xiaomi_miio/config_flow.py b/homeassistant/components/xiaomi_miio/config_flow.py index 70e6fb5c0b6..2a4deffb161 100644 --- a/homeassistant/components/xiaomi_miio/config_flow.py +++ b/homeassistant/components/xiaomi_miio/config_flow.py @@ -13,7 +13,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import zeroconf from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry -from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_TOKEN +from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.device_registry import format_mac @@ -23,7 +23,6 @@ from .const import ( CONF_CLOUD_PASSWORD, CONF_CLOUD_SUBDEVICES, CONF_CLOUD_USERNAME, - CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, CONF_MAC, diff --git a/homeassistant/components/xiaomi_miio/const.py b/homeassistant/components/xiaomi_miio/const.py index 6621e41e7aa..376c23c10d4 100644 --- a/homeassistant/components/xiaomi_miio/const.py +++ b/homeassistant/components/xiaomi_miio/const.py @@ -18,7 +18,6 @@ DOMAIN = "xiaomi_miio" # Config flow CONF_FLOW_TYPE = "config_flow_device" CONF_GATEWAY = "gateway" -CONF_DEVICE = "device" CONF_MAC = "mac" CONF_CLOUD_USERNAME = "cloud_username" CONF_CLOUD_PASSWORD = "cloud_password" diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py index 9be019ed724..30383426210 100644 --- a/homeassistant/components/xiaomi_miio/fan.py +++ b/homeassistant/components/xiaomi_miio/fan.py @@ -30,7 +30,7 @@ import voluptuous as vol from homeassistant.components.fan import FanEntity, FanEntityFeature from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_ENTITY_ID, CONF_MODEL +from homeassistant.const import ATTR_ENTITY_ID, CONF_DEVICE, CONF_MODEL from homeassistant.core import HomeAssistant, ServiceCall, callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -40,7 +40,6 @@ from homeassistant.util.percentage import ( ) from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, DOMAIN, FEATURE_FLAGS_AIRFRESH, diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py index 0438b606efd..f2660bef68a 100644 --- a/homeassistant/components/xiaomi_miio/humidifier.py +++ b/homeassistant/components/xiaomi_miio/humidifier.py @@ -20,13 +20,12 @@ from homeassistant.components.humidifier import ( HumidifierEntityFeature, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_MODE, CONF_MODEL +from homeassistant.const import ATTR_MODE, CONF_DEVICE, CONF_MODEL from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.util.percentage import percentage_to_ranged_value from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, DOMAIN, KEY_COORDINATOR, diff --git a/homeassistant/components/xiaomi_miio/light.py b/homeassistant/components/xiaomi_miio/light.py index 1fc032b5c36..8d198ae2a8f 100644 --- a/homeassistant/components/xiaomi_miio/light.py +++ b/homeassistant/components/xiaomi_miio/light.py @@ -33,7 +33,13 @@ from homeassistant.components.light import ( LightEntity, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_ENTITY_ID, CONF_HOST, CONF_MODEL, CONF_TOKEN +from homeassistant.const import ( + ATTR_ENTITY_ID, + CONF_DEVICE, + CONF_HOST, + CONF_MODEL, + CONF_TOKEN, +) from homeassistant.core import HomeAssistant, ServiceCall import homeassistant.helpers.config_validation as cv from homeassistant.helpers.device_registry import DeviceInfo @@ -41,7 +47,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.util import color, dt as dt_util from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, DOMAIN, diff --git a/homeassistant/components/xiaomi_miio/number.py b/homeassistant/components/xiaomi_miio/number.py index a8346caa894..1062b2d42b0 100644 --- a/homeassistant/components/xiaomi_miio/number.py +++ b/homeassistant/components/xiaomi_miio/number.py @@ -13,6 +13,7 @@ from homeassistant.components.number import ( ) from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( + CONF_DEVICE, CONF_MODEL, DEGREE, REVOLUTIONS_PER_MINUTE, @@ -25,7 +26,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import DataUpdateCoordinator from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, DOMAIN, FEATURE_FLAGS_AIRFRESH, diff --git a/homeassistant/components/xiaomi_miio/select.py b/homeassistant/components/xiaomi_miio/select.py index 74ce36ca57a..f6123ad0f0c 100644 --- a/homeassistant/components/xiaomi_miio/select.py +++ b/homeassistant/components/xiaomi_miio/select.py @@ -29,12 +29,11 @@ from miio.integrations.humidifier.zhimi.airhumidifier_miot import ( from homeassistant.components.select import SelectEntity, SelectEntityDescription from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_MODEL, EntityCategory +from homeassistant.const import CONF_DEVICE, CONF_MODEL, EntityCategory from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, DOMAIN, KEY_COORDINATOR, diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py index 17d60e1a952..200a67e5f54 100644 --- a/homeassistant/components/xiaomi_miio/sensor.py +++ b/homeassistant/components/xiaomi_miio/sensor.py @@ -28,6 +28,7 @@ from homeassistant.const import ( ATTR_TEMPERATURE, CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONCENTRATION_PARTS_PER_MILLION, + CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN, @@ -48,7 +49,6 @@ from homeassistant.util import dt as dt_util from . import VacuumCoordinatorDataAttributes from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, DOMAIN, diff --git a/homeassistant/components/xiaomi_miio/switch.py b/homeassistant/components/xiaomi_miio/switch.py index 9bba9f61123..7de6192e736 100644 --- a/homeassistant/components/xiaomi_miio/switch.py +++ b/homeassistant/components/xiaomi_miio/switch.py @@ -21,6 +21,7 @@ from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_MODE, ATTR_TEMPERATURE, + CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN, @@ -31,7 +32,6 @@ import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, CONF_GATEWAY, DOMAIN, diff --git a/homeassistant/components/xiaomi_miio/vacuum.py b/homeassistant/components/xiaomi_miio/vacuum.py index 34a7b949646..73e2e54b62f 100644 --- a/homeassistant/components/xiaomi_miio/vacuum.py +++ b/homeassistant/components/xiaomi_miio/vacuum.py @@ -19,6 +19,7 @@ from homeassistant.components.vacuum import ( VacuumEntityFeature, ) from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_DEVICE from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import config_validation as cv, entity_platform from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -27,7 +28,6 @@ from homeassistant.util.dt import as_utc from . import VacuumCoordinatorData from .const import ( - CONF_DEVICE, CONF_FLOW_TYPE, DOMAIN, KEY_COORDINATOR, diff --git a/tests/components/braviatv/test_config_flow.py b/tests/components/braviatv/test_config_flow.py index 1ac1fcd4bea..0f1d08792fa 100644 --- a/tests/components/braviatv/test_config_flow.py +++ b/tests/components/braviatv/test_config_flow.py @@ -12,14 +12,13 @@ import pytest from homeassistant import data_entry_flow from homeassistant.components import ssdp from homeassistant.components.braviatv.const import ( - CONF_CLIENT_ID, CONF_NICKNAME, CONF_USE_PSK, DOMAIN, NICKNAME_PREFIX, ) from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_SSDP, SOURCE_USER -from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PIN +from homeassistant.const import CONF_CLIENT_ID, CONF_HOST, CONF_MAC, CONF_PIN from homeassistant.core import HomeAssistant from homeassistant.helpers import instance_id diff --git a/tests/components/github/conftest.py b/tests/components/github/conftest.py index 04b53da6b91..b0b6f243fa0 100644 --- a/tests/components/github/conftest.py +++ b/tests/components/github/conftest.py @@ -4,11 +4,8 @@ from unittest.mock import patch import pytest -from homeassistant.components.github.const import ( - CONF_ACCESS_TOKEN, - CONF_REPOSITORIES, - DOMAIN, -) +from homeassistant.components.github.const import CONF_REPOSITORIES, DOMAIN +from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.core import HomeAssistant from .common import MOCK_ACCESS_TOKEN, TEST_REPOSITORY, setup_github_integration diff --git a/tests/components/github/test_config_flow.py b/tests/components/github/test_config_flow.py index ad3be582a5d..a86e1d134aa 100644 --- a/tests/components/github/test_config_flow.py +++ b/tests/components/github/test_config_flow.py @@ -6,11 +6,11 @@ from aiogithubapi import GitHubException from homeassistant import config_entries from homeassistant.components.github.config_flow import get_repositories from homeassistant.components.github.const import ( - CONF_ACCESS_TOKEN, CONF_REPOSITORIES, DEFAULT_REPOSITORIES, DOMAIN, ) +from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType diff --git a/tests/components/mysensors/conftest.py b/tests/components/mysensors/conftest.py index 64fbb61aac3..6df50f04ae2 100644 --- a/tests/components/mysensors/conftest.py +++ b/tests/components/mysensors/conftest.py @@ -16,12 +16,12 @@ from homeassistant.components.mqtt import DOMAIN as MQTT_DOMAIN from homeassistant.components.mysensors.config_flow import DEFAULT_BAUD_RATE from homeassistant.components.mysensors.const import ( CONF_BAUD_RATE, - CONF_DEVICE, CONF_GATEWAY_TYPE, CONF_GATEWAY_TYPE_SERIAL, CONF_VERSION, DOMAIN, ) +from homeassistant.const import CONF_DEVICE from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component diff --git a/tests/components/mysensors/test_config_flow.py b/tests/components/mysensors/test_config_flow.py index dc24a48edd4..bff13d1604f 100644 --- a/tests/components/mysensors/test_config_flow.py +++ b/tests/components/mysensors/test_config_flow.py @@ -9,7 +9,6 @@ import pytest from homeassistant import config_entries from homeassistant.components.mysensors.const import ( CONF_BAUD_RATE, - CONF_DEVICE, CONF_GATEWAY_TYPE, CONF_GATEWAY_TYPE_MQTT, CONF_GATEWAY_TYPE_SERIAL, @@ -23,6 +22,7 @@ from homeassistant.components.mysensors.const import ( DOMAIN, ConfGatewayType, ) +from homeassistant.const import CONF_DEVICE from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResult, FlowResultType diff --git a/tests/components/subaru/conftest.py b/tests/components/subaru/conftest.py index 8bed67cb15f..4927525d896 100644 --- a/tests/components/subaru/conftest.py +++ b/tests/components/subaru/conftest.py @@ -8,7 +8,6 @@ from subarulink.const import COUNTRY_USA from homeassistant import config_entries from homeassistant.components.homeassistant import DOMAIN as HA_DOMAIN from homeassistant.components.subaru.const import ( - CONF_COUNTRY, CONF_UPDATE_ENABLED, DOMAIN, FETCH_INTERVAL, @@ -22,7 +21,13 @@ from homeassistant.components.subaru.const import ( VEHICLE_NAME, ) from homeassistant.config_entries import ConfigEntryState -from homeassistant.const import CONF_DEVICE_ID, CONF_PASSWORD, CONF_PIN, CONF_USERNAME +from homeassistant.const import ( + CONF_COUNTRY, + CONF_DEVICE_ID, + CONF_PASSWORD, + CONF_PIN, + CONF_USERNAME, +) from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util diff --git a/tests/components/workday/test_config_flow.py b/tests/components/workday/test_config_flow.py index 57a7046546e..fb0d78365e8 100644 --- a/tests/components/workday/test_config_flow.py +++ b/tests/components/workday/test_config_flow.py @@ -9,7 +9,6 @@ import pytest from homeassistant import config_entries from homeassistant.components.workday.const import ( CONF_ADD_HOLIDAYS, - CONF_COUNTRY, CONF_EXCLUDES, CONF_OFFSET, CONF_REMOVE_HOLIDAYS, @@ -19,7 +18,7 @@ from homeassistant.components.workday.const import ( DEFAULT_WORKDAYS, DOMAIN, ) -from homeassistant.const import CONF_LANGUAGE, CONF_NAME +from homeassistant.const import CONF_COUNTRY, CONF_LANGUAGE, CONF_NAME from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType from homeassistant.util.dt import UTC diff --git a/tests/components/xiaomi_miio/test_button.py b/tests/components/xiaomi_miio/test_button.py index 995c5ae034c..d00b2ec5853 100644 --- a/tests/components/xiaomi_miio/test_button.py +++ b/tests/components/xiaomi_miio/test_button.py @@ -5,7 +5,6 @@ import pytest from homeassistant.components.button import DOMAIN, SERVICE_PRESS from homeassistant.components.xiaomi_miio.const import ( - CONF_DEVICE, CONF_FLOW_TYPE, CONF_MAC, DOMAIN as XIAOMI_DOMAIN, @@ -13,6 +12,7 @@ from homeassistant.components.xiaomi_miio.const import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN, diff --git a/tests/components/xiaomi_miio/test_config_flow.py b/tests/components/xiaomi_miio/test_config_flow.py index a436908b44f..0fe8c3d247c 100644 --- a/tests/components/xiaomi_miio/test_config_flow.py +++ b/tests/components/xiaomi_miio/test_config_flow.py @@ -10,7 +10,7 @@ import pytest from homeassistant import config_entries, data_entry_flow from homeassistant.components import zeroconf from homeassistant.components.xiaomi_miio import const -from homeassistant.const import CONF_HOST, CONF_MODEL, CONF_TOKEN +from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN from homeassistant.core import HomeAssistant from . import TEST_MAC @@ -685,7 +685,7 @@ async def test_config_flow_step_device_manual_model_succes(hass: HomeAssistant) assert result["type"] == "create_entry" assert result["title"] == overwrite_model assert result["data"] == { - const.CONF_FLOW_TYPE: const.CONF_DEVICE, + const.CONF_FLOW_TYPE: CONF_DEVICE, const.CONF_CLOUD_USERNAME: None, const.CONF_CLOUD_PASSWORD: None, const.CONF_CLOUD_COUNTRY: None, @@ -729,7 +729,7 @@ async def config_flow_device_success(hass, model_to_test): assert result["type"] == "create_entry" assert result["title"] == model_to_test assert result["data"] == { - const.CONF_FLOW_TYPE: const.CONF_DEVICE, + const.CONF_FLOW_TYPE: CONF_DEVICE, const.CONF_CLOUD_USERNAME: None, const.CONF_CLOUD_PASSWORD: None, const.CONF_CLOUD_COUNTRY: None, @@ -775,7 +775,7 @@ async def config_flow_generic_roborock(hass): assert result["type"] == "create_entry" assert result["title"] == dummy_model assert result["data"] == { - const.CONF_FLOW_TYPE: const.CONF_DEVICE, + const.CONF_FLOW_TYPE: CONF_DEVICE, const.CONF_CLOUD_USERNAME: None, const.CONF_CLOUD_PASSWORD: None, const.CONF_CLOUD_COUNTRY: None, @@ -829,7 +829,7 @@ async def zeroconf_device_success(hass, zeroconf_name_to_test, model_to_test): assert result["type"] == "create_entry" assert result["title"] == model_to_test assert result["data"] == { - const.CONF_FLOW_TYPE: const.CONF_DEVICE, + const.CONF_FLOW_TYPE: CONF_DEVICE, const.CONF_CLOUD_USERNAME: None, const.CONF_CLOUD_PASSWORD: None, const.CONF_CLOUD_COUNTRY: None, diff --git a/tests/components/xiaomi_miio/test_select.py b/tests/components/xiaomi_miio/test_select.py index 48b8216bffc..04cb6ee6ea7 100644 --- a/tests/components/xiaomi_miio/test_select.py +++ b/tests/components/xiaomi_miio/test_select.py @@ -17,7 +17,6 @@ from homeassistant.components.select import ( ) from homeassistant.components.xiaomi_miio import UPDATE_INTERVAL from homeassistant.components.xiaomi_miio.const import ( - CONF_DEVICE, CONF_FLOW_TYPE, CONF_MAC, DOMAIN as XIAOMI_DOMAIN, @@ -25,6 +24,7 @@ from homeassistant.components.xiaomi_miio.const import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + CONF_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN, diff --git a/tests/components/xiaomi_miio/test_vacuum.py b/tests/components/xiaomi_miio/test_vacuum.py index 422a52b44ac..e1f2233c5bc 100644 --- a/tests/components/xiaomi_miio/test_vacuum.py +++ b/tests/components/xiaomi_miio/test_vacuum.py @@ -23,7 +23,6 @@ from homeassistant.components.vacuum import ( STATE_ERROR, ) from homeassistant.components.xiaomi_miio.const import ( - CONF_DEVICE, CONF_FLOW_TYPE, CONF_MAC, DOMAIN as XIAOMI_DOMAIN, @@ -32,6 +31,7 @@ from homeassistant.components.xiaomi_miio.const import ( from homeassistant.components.xiaomi_miio.vacuum import ( ATTR_ERROR, ATTR_TIMERS, + CONF_DEVICE, SERVICE_CLEAN_SEGMENT, SERVICE_CLEAN_ZONE, SERVICE_GOTO,