diff --git a/homeassistant/components/airthings/__init__.py b/homeassistant/components/airthings/__init__.py index 423e890a855..d596c1db757 100644 --- a/homeassistant/components/airthings/__init__.py +++ b/homeassistant/components/airthings/__init__.py @@ -7,12 +7,12 @@ import logging from airthings import Airthings, AirthingsError from homeassistant.config_entries import ConfigEntry -from homeassistant.const import Platform +from homeassistant.const import CONF_ID, Platform from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed -from .const import CONF_ID, CONF_SECRET, DOMAIN +from .const import CONF_SECRET, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/airthings/config_flow.py b/homeassistant/components/airthings/config_flow.py index f07f7164f2b..62f66213a0f 100644 --- a/homeassistant/components/airthings/config_flow.py +++ b/homeassistant/components/airthings/config_flow.py @@ -8,10 +8,11 @@ import airthings import voluptuous as vol from homeassistant import config_entries +from homeassistant.const import CONF_ID from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.aiohttp_client import async_get_clientsession -from .const import CONF_ID, CONF_SECRET, DOMAIN +from .const import CONF_SECRET, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/airthings/const.py b/homeassistant/components/airthings/const.py index 70de549141b..5f846fbb31d 100644 --- a/homeassistant/components/airthings/const.py +++ b/homeassistant/components/airthings/const.py @@ -2,5 +2,4 @@ DOMAIN = "airthings" -CONF_ID = "id" CONF_SECRET = "secret" diff --git a/homeassistant/components/anthemav/config_flow.py b/homeassistant/components/anthemav/config_flow.py index e75c67cb2c5..892c40cde0e 100644 --- a/homeassistant/components/anthemav/config_flow.py +++ b/homeassistant/components/anthemav/config_flow.py @@ -10,18 +10,12 @@ from anthemav.device_error import DeviceError import voluptuous as vol from homeassistant.config_entries import ConfigFlow -from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PORT +from homeassistant.const import CONF_HOST, CONF_MAC, CONF_MODEL, CONF_PORT from homeassistant.data_entry_flow import FlowResult import homeassistant.helpers.config_validation as cv from homeassistant.helpers.device_registry import format_mac -from .const import ( - CONF_MODEL, - DEFAULT_NAME, - DEFAULT_PORT, - DEVICE_TIMEOUT_SECONDS, - DOMAIN, -) +from .const import DEFAULT_NAME, DEFAULT_PORT, DEVICE_TIMEOUT_SECONDS, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/anthemav/const.py b/homeassistant/components/anthemav/const.py index 2b1ff753fba..7cf586fb05d 100644 --- a/homeassistant/components/anthemav/const.py +++ b/homeassistant/components/anthemav/const.py @@ -1,6 +1,6 @@ """Constants for the Anthem A/V Receivers integration.""" ANTHEMAV_UPDATE_SIGNAL = "anthemav_update" -CONF_MODEL = "model" + DEFAULT_NAME = "Anthem AV" DEFAULT_PORT = 14999 DOMAIN = "anthemav" diff --git a/homeassistant/components/anthemav/media_player.py b/homeassistant/components/anthemav/media_player.py index 91f8536d348..c13e6389bfc 100644 --- a/homeassistant/components/anthemav/media_player.py +++ b/homeassistant/components/anthemav/media_player.py @@ -13,13 +13,13 @@ from homeassistant.components.media_player import ( MediaPlayerState, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_MAC +from homeassistant.const import CONF_MAC, CONF_MODEL from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity_platform import AddEntitiesCallback -from .const import ANTHEMAV_UPDATE_SIGNAL, CONF_MODEL, DOMAIN, MANUFACTURER +from .const import ANTHEMAV_UPDATE_SIGNAL, DOMAIN, MANUFACTURER _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/dsmr/config_flow.py b/homeassistant/components/dsmr/config_flow.py index 86a7bee9ef1..376b4d100fc 100644 --- a/homeassistant/components/dsmr/config_flow.py +++ b/homeassistant/components/dsmr/config_flow.py @@ -19,13 +19,12 @@ import voluptuous as vol from homeassistant import config_entries, core, exceptions from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TYPE +from homeassistant.const import CONF_HOST, CONF_PORT, CONF_PROTOCOL, CONF_TYPE from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from .const import ( CONF_DSMR_VERSION, - CONF_PROTOCOL, CONF_SERIAL_ID, CONF_SERIAL_ID_GAS, CONF_TIME_BETWEEN_UPDATE, diff --git a/homeassistant/components/dsmr/const.py b/homeassistant/components/dsmr/const.py index 4ac59372deb..9504929c5a9 100644 --- a/homeassistant/components/dsmr/const.py +++ b/homeassistant/components/dsmr/const.py @@ -11,7 +11,6 @@ LOGGER = logging.getLogger(__package__) PLATFORMS = [Platform.SENSOR] CONF_DSMR_VERSION = "dsmr_version" -CONF_PROTOCOL = "protocol" CONF_TIME_BETWEEN_UPDATE = "time_between_update" CONF_SERIAL_ID = "serial_id" diff --git a/homeassistant/components/dsmr/sensor.py b/homeassistant/components/dsmr/sensor.py index 6aadcd63d44..9c511ef9191 100644 --- a/homeassistant/components/dsmr/sensor.py +++ b/homeassistant/components/dsmr/sensor.py @@ -28,6 +28,7 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_HOST, CONF_PORT, + CONF_PROTOCOL, EVENT_HOMEASSISTANT_STOP, EntityCategory, UnitOfEnergy, @@ -46,7 +47,6 @@ from homeassistant.util import Throttle from .const import ( CONF_DSMR_VERSION, - CONF_PROTOCOL, CONF_SERIAL_ID, CONF_SERIAL_ID_GAS, CONF_TIME_BETWEEN_UPDATE, diff --git a/homeassistant/components/environment_canada/__init__.py b/homeassistant/components/environment_canada/__init__.py index 64a4b7dad20..14fb3e8e54c 100644 --- a/homeassistant/components/environment_canada/__init__.py +++ b/homeassistant/components/environment_canada/__init__.py @@ -6,13 +6,13 @@ import xml.etree.ElementTree as et from env_canada import ECAirQuality, ECRadar, ECWeather, ec_exc from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, Platform +from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed -from .const import CONF_LANGUAGE, CONF_STATION, DOMAIN +from .const import CONF_STATION, DOMAIN DEFAULT_RADAR_UPDATE_INTERVAL = timedelta(minutes=5) DEFAULT_WEATHER_UPDATE_INTERVAL = timedelta(minutes=5) diff --git a/homeassistant/components/environment_canada/config_flow.py b/homeassistant/components/environment_canada/config_flow.py index 07b6eac0da0..f4b9ee792c3 100644 --- a/homeassistant/components/environment_canada/config_flow.py +++ b/homeassistant/components/environment_canada/config_flow.py @@ -7,10 +7,10 @@ from env_canada import ECWeather, ec_exc import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE +from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE from homeassistant.helpers import config_validation as cv -from .const import CONF_LANGUAGE, CONF_STATION, CONF_TITLE, DOMAIN +from .const import CONF_STATION, CONF_TITLE, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/environment_canada/const.py b/homeassistant/components/environment_canada/const.py index 16f7dc1cf99..f1f6db2e0df 100644 --- a/homeassistant/components/environment_canada/const.py +++ b/homeassistant/components/environment_canada/const.py @@ -2,7 +2,6 @@ ATTR_OBSERVATION_TIME = "observation_time" ATTR_STATION = "station" -CONF_LANGUAGE = "language" CONF_STATION = "station" CONF_TITLE = "title" DOMAIN = "environment_canada" diff --git a/homeassistant/components/eufylife_ble/__init__.py b/homeassistant/components/eufylife_ble/__init__.py index 49370c2efcf..f407e86a289 100644 --- a/homeassistant/components/eufylife_ble/__init__.py +++ b/homeassistant/components/eufylife_ble/__init__.py @@ -6,10 +6,10 @@ from eufylife_ble_client import EufyLifeBLEDevice from homeassistant.components import bluetooth from homeassistant.components.bluetooth.match import ADDRESS, BluetoothCallbackMatcher from homeassistant.config_entries import ConfigEntry -from homeassistant.const import EVENT_HOMEASSISTANT_STOP, Platform +from homeassistant.const import CONF_MODEL, EVENT_HOMEASSISTANT_STOP, Platform from homeassistant.core import Event, HomeAssistant, callback -from .const import CONF_MODEL, DOMAIN +from .const import DOMAIN from .models import EufyLifeData PLATFORMS: list[Platform] = [Platform.SENSOR] diff --git a/homeassistant/components/eufylife_ble/config_flow.py b/homeassistant/components/eufylife_ble/config_flow.py index 9e1ff4af7a8..e3a1a301f25 100644 --- a/homeassistant/components/eufylife_ble/config_flow.py +++ b/homeassistant/components/eufylife_ble/config_flow.py @@ -11,10 +11,10 @@ from homeassistant.components.bluetooth import ( async_discovered_service_info, ) from homeassistant.config_entries import ConfigFlow -from homeassistant.const import CONF_ADDRESS +from homeassistant.const import CONF_ADDRESS, CONF_MODEL from homeassistant.data_entry_flow import FlowResult -from .const import CONF_MODEL, DOMAIN +from .const import DOMAIN class EufyLifeConfigFlow(ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/eufylife_ble/const.py b/homeassistant/components/eufylife_ble/const.py index dac0afc9109..e6beb34aaff 100644 --- a/homeassistant/components/eufylife_ble/const.py +++ b/homeassistant/components/eufylife_ble/const.py @@ -1,5 +1,3 @@ """Constants for the EufyLife integration.""" DOMAIN = "eufylife_ble" - -CONF_MODEL = "model" diff --git a/homeassistant/components/flux_led/config_flow.py b/homeassistant/components/flux_led/config_flow.py index 11e045bec70..9094006c791 100644 --- a/homeassistant/components/flux_led/config_flow.py +++ b/homeassistant/components/flux_led/config_flow.py @@ -2,7 +2,7 @@ from __future__ import annotations import contextlib -from typing import Any, Final, cast +from typing import Any, cast from flux_led.const import ( ATTR_ID, @@ -17,7 +17,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import dhcp -from homeassistant.const import CONF_HOST +from homeassistant.const import CONF_DEVICE, CONF_HOST from homeassistant.core import callback from homeassistant.data_entry_flow import AbortFlow, FlowResult from homeassistant.helpers import device_registry as dr @@ -47,8 +47,6 @@ from .discovery import ( ) from .util import format_as_flux_mac, mac_matches_by_one -CONF_DEVICE: Final = "device" - class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): """Handle a config flow for Magic Home Integration.""" diff --git a/homeassistant/components/flux_led/const.py b/homeassistant/components/flux_led/const.py index db545aa1e68..8b42f5f2e0d 100644 --- a/homeassistant/components/flux_led/const.py +++ b/homeassistant/components/flux_led/const.py @@ -65,7 +65,6 @@ TRANSITION_STROBE: Final = "strobe" CONF_COLORS: Final = "colors" CONF_SPEED_PCT: Final = "speed_pct" CONF_TRANSITION: Final = "transition" -CONF_EFFECT: Final = "effect" EFFECT_SPEED_SUPPORT_MODES: Final = {ColorMode.RGB, ColorMode.RGBW, ColorMode.RGBWW} diff --git a/homeassistant/components/flux_led/light.py b/homeassistant/components/flux_led/light.py index d880d517f1a..1232cb41031 100644 --- a/homeassistant/components/flux_led/light.py +++ b/homeassistant/components/flux_led/light.py @@ -22,6 +22,7 @@ from homeassistant.components.light import ( LightEntity, LightEntityFeature, ) +from homeassistant.const import CONF_EFFECT from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_platform import homeassistant.helpers.config_validation as cv @@ -37,7 +38,6 @@ from .const import ( CONF_CUSTOM_EFFECT_COLORS, CONF_CUSTOM_EFFECT_SPEED_PCT, CONF_CUSTOM_EFFECT_TRANSITION, - CONF_EFFECT, CONF_SPEED_PCT, CONF_TRANSITION, DEFAULT_EFFECT_SPEED, diff --git a/homeassistant/components/frontier_silicon/__init__.py b/homeassistant/components/frontier_silicon/__init__.py index 62f2623d05e..f1e0ad48d30 100644 --- a/homeassistant/components/frontier_silicon/__init__.py +++ b/homeassistant/components/frontier_silicon/__init__.py @@ -6,11 +6,11 @@ import logging from afsapi import AFSAPI, ConnectionError as FSConnectionError from homeassistant.config_entries import ConfigEntry -from homeassistant.const import Platform +from homeassistant.const import CONF_PIN, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady -from .const import CONF_PIN, CONF_WEBFSAPI_URL, DOMAIN +from .const import CONF_WEBFSAPI_URL, DOMAIN PLATFORMS = [Platform.MEDIA_PLAYER] diff --git a/homeassistant/components/frontier_silicon/config_flow.py b/homeassistant/components/frontier_silicon/config_flow.py index 2274b1cdb44..470be7d9b26 100644 --- a/homeassistant/components/frontier_silicon/config_flow.py +++ b/homeassistant/components/frontier_silicon/config_flow.py @@ -16,11 +16,10 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import ssdp -from homeassistant.const import CONF_HOST, CONF_PORT +from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT from homeassistant.data_entry_flow import FlowResult from .const import ( - CONF_PIN, CONF_WEBFSAPI_URL, DEFAULT_PIN, DEFAULT_PORT, diff --git a/homeassistant/components/frontier_silicon/const.py b/homeassistant/components/frontier_silicon/const.py index 34201fe8f4a..94f4e09a35a 100644 --- a/homeassistant/components/frontier_silicon/const.py +++ b/homeassistant/components/frontier_silicon/const.py @@ -2,7 +2,6 @@ DOMAIN = "frontier_silicon" CONF_WEBFSAPI_URL = "webfsapi_url" -CONF_PIN = "pin" SSDP_ST = "urn:schemas-frontier-silicon-com:undok:fsapi:1" SSDP_ATTR_SPEAKER_NAME = "SPEAKER-NAME" diff --git a/homeassistant/components/google_travel_time/config_flow.py b/homeassistant/components/google_travel_time/config_flow.py index 83e144f6bbd..ec8187d91af 100644 --- a/homeassistant/components/google_travel_time/config_flow.py +++ b/homeassistant/components/google_travel_time/config_flow.py @@ -4,7 +4,7 @@ from __future__ import annotations import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_API_KEY, CONF_MODE, CONF_NAME +from homeassistant.const import CONF_API_KEY, CONF_LANGUAGE, CONF_MODE, CONF_NAME from homeassistant.core import HomeAssistant, callback from homeassistant.data_entry_flow import FlowResult import homeassistant.helpers.config_validation as cv @@ -23,7 +23,6 @@ from .const import ( CONF_AVOID, CONF_DEPARTURE_TIME, CONF_DESTINATION, - CONF_LANGUAGE, CONF_ORIGIN, CONF_TIME, CONF_TIME_TYPE, diff --git a/homeassistant/components/google_travel_time/const.py b/homeassistant/components/google_travel_time/const.py index 0535e295b93..041858d948f 100644 --- a/homeassistant/components/google_travel_time/const.py +++ b/homeassistant/components/google_travel_time/const.py @@ -7,7 +7,6 @@ CONF_DESTINATION = "destination" CONF_OPTIONS = "options" CONF_ORIGIN = "origin" CONF_TRAVEL_MODE = "travel_mode" -CONF_LANGUAGE = "language" CONF_AVOID = "avoid" CONF_UNITS = "units" CONF_ARRIVAL_TIME = "arrival_time" diff --git a/homeassistant/components/homewizard/config_flow.py b/homeassistant/components/homewizard/config_flow.py index b24b49da965..bf425fe5c41 100644 --- a/homeassistant/components/homewizard/config_flow.py +++ b/homeassistant/components/homewizard/config_flow.py @@ -12,13 +12,12 @@ from voluptuous import Required, Schema from homeassistant.components import onboarding, zeroconf from homeassistant.config_entries import ConfigEntry, ConfigFlow -from homeassistant.const import CONF_IP_ADDRESS +from homeassistant.const import CONF_IP_ADDRESS, CONF_PATH from homeassistant.data_entry_flow import AbortFlow, FlowResult from homeassistant.exceptions import HomeAssistantError from .const import ( CONF_API_ENABLED, - CONF_PATH, CONF_PRODUCT_NAME, CONF_PRODUCT_TYPE, CONF_SERIAL, diff --git a/homeassistant/components/homewizard/const.py b/homeassistant/components/homewizard/const.py index daeed9d3505..f1a1bee2568 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_PATH = "path" CONF_PRODUCT_NAME = "product_name" CONF_PRODUCT_TYPE = "product_type" CONF_SERIAL = "serial" diff --git a/homeassistant/components/influxdb/__init__.py b/homeassistant/components/influxdb/__init__.py index f879ab37e8f..24c80dc1d54 100644 --- a/homeassistant/components/influxdb/__init__.py +++ b/homeassistant/components/influxdb/__init__.py @@ -22,9 +22,17 @@ import voluptuous as vol from homeassistant.const import ( CONF_DOMAIN, CONF_ENTITY_ID, + CONF_HOST, + CONF_PASSWORD, + CONF_PATH, + CONF_PORT, + CONF_SSL, CONF_TIMEOUT, + CONF_TOKEN, CONF_UNIT_OF_MEASUREMENT, CONF_URL, + CONF_USERNAME, + CONF_VERIFY_SSL, EVENT_HOMEASSISTANT_STOP, EVENT_STATE_CHANGED, STATE_UNAVAILABLE, @@ -56,23 +64,15 @@ from .const import ( CONF_COMPONENT_CONFIG_GLOB, CONF_DB_NAME, CONF_DEFAULT_MEASUREMENT, - CONF_HOST, CONF_IGNORE_ATTRIBUTES, CONF_MEASUREMENT_ATTR, CONF_ORG, CONF_OVERRIDE_MEASUREMENT, - CONF_PASSWORD, - CONF_PATH, - CONF_PORT, CONF_PRECISION, CONF_RETRY_COUNT, - CONF_SSL, CONF_SSL_CA_CERT, CONF_TAGS, CONF_TAGS_ATTRIBUTES, - CONF_TOKEN, - CONF_USERNAME, - CONF_VERIFY_SSL, CONNECTION_ERROR, DEFAULT_API_VERSION, DEFAULT_HOST_V2, diff --git a/homeassistant/components/influxdb/const.py b/homeassistant/components/influxdb/const.py index f3b0b66df54..5ffd70fe992 100644 --- a/homeassistant/components/influxdb/const.py +++ b/homeassistant/components/influxdb/const.py @@ -33,7 +33,6 @@ CONF_IGNORE_ATTRIBUTES = "ignore_attributes" CONF_PRECISION = "precision" CONF_SSL_CA_CERT = "ssl_ca_cert" -CONF_LANGUAGE = "language" CONF_QUERIES = "queries" CONF_QUERIES_FLUX = "queries_flux" CONF_GROUP_FUNCTION = "group_function" diff --git a/homeassistant/components/influxdb/sensor.py b/homeassistant/components/influxdb/sensor.py index b4f643e876f..a46ec581207 100644 --- a/homeassistant/components/influxdb/sensor.py +++ b/homeassistant/components/influxdb/sensor.py @@ -13,6 +13,7 @@ from homeassistant.components.sensor import ( ) from homeassistant.const import ( CONF_API_VERSION, + CONF_LANGUAGE, CONF_NAME, CONF_UNIQUE_ID, CONF_UNIT_OF_MEASUREMENT, @@ -35,7 +36,6 @@ from .const import ( CONF_FIELD, CONF_GROUP_FUNCTION, CONF_IMPORTS, - CONF_LANGUAGE, CONF_MEASUREMENT_NAME, CONF_QUERIES, CONF_QUERIES_FLUX, diff --git a/homeassistant/components/knx/button.py b/homeassistant/components/knx/button.py index 274ced80146..94b5b51e401 100644 --- a/homeassistant/components/knx/button.py +++ b/homeassistant/components/knx/button.py @@ -6,18 +6,12 @@ from xknx.devices import RawValue as XknxRawValue from homeassistant import config_entries from homeassistant.components.button import ButtonEntity -from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, Platform +from homeassistant.const import CONF_ENTITY_CATEGORY, CONF_NAME, CONF_PAYLOAD, Platform from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import ConfigType -from .const import ( - CONF_PAYLOAD, - CONF_PAYLOAD_LENGTH, - DATA_KNX_CONFIG, - DOMAIN, - KNX_ADDRESS, -) +from .const import CONF_PAYLOAD_LENGTH, DATA_KNX_CONFIG, DOMAIN, KNX_ADDRESS from .knx_entity import KnxEntity diff --git a/homeassistant/components/knx/const.py b/homeassistant/components/knx/const.py index 519d5d0742d..3d1e3c62a34 100644 --- a/homeassistant/components/knx/const.py +++ b/homeassistant/components/knx/const.py @@ -68,7 +68,6 @@ CONF_KNX_SECURE_USER_PASSWORD: Final = "user_password" CONF_KNX_SECURE_DEVICE_AUTHENTICATION: Final = "device_authentication" -CONF_PAYLOAD: Final = "payload" CONF_PAYLOAD_LENGTH: Final = "payload_length" CONF_RESET_AFTER: Final = "reset_after" CONF_RESPOND_TO_READ: Final = "respond_to_read" diff --git a/homeassistant/components/knx/schema.py b/homeassistant/components/knx/schema.py index 8240fbaf3c1..c7bcd90538f 100644 --- a/homeassistant/components/knx/schema.py +++ b/homeassistant/components/knx/schema.py @@ -37,6 +37,7 @@ from homeassistant.const import ( CONF_EVENT, CONF_MODE, CONF_NAME, + CONF_PAYLOAD, CONF_TYPE, Platform, ) @@ -46,7 +47,6 @@ from homeassistant.helpers.entity import ENTITY_CATEGORIES_SCHEMA from .const import ( CONF_INVERT, CONF_KNX_EXPOSE, - CONF_PAYLOAD, CONF_PAYLOAD_LENGTH, CONF_RESET_AFTER, CONF_RESPOND_TO_READ, diff --git a/homeassistant/components/knx/select.py b/homeassistant/components/knx/select.py index 5baa068eaa6..2852917e021 100644 --- a/homeassistant/components/knx/select.py +++ b/homeassistant/components/knx/select.py @@ -9,6 +9,7 @@ from homeassistant.components.select import SelectEntity from homeassistant.const import ( CONF_ENTITY_CATEGORY, CONF_NAME, + CONF_PAYLOAD, STATE_UNAVAILABLE, STATE_UNKNOWN, Platform, @@ -19,7 +20,6 @@ from homeassistant.helpers.restore_state import RestoreEntity from homeassistant.helpers.typing import ConfigType from .const import ( - CONF_PAYLOAD, CONF_PAYLOAD_LENGTH, CONF_RESPOND_TO_READ, CONF_STATE_ADDRESS, diff --git a/homeassistant/components/lcn/const.py b/homeassistant/components/lcn/const.py index bb97658b880..e8da5b39073 100644 --- a/homeassistant/components/lcn/const.py +++ b/homeassistant/components/lcn/const.py @@ -21,7 +21,6 @@ CONNECTION = "connection" CONF_HARDWARE_SERIAL = "hardware_serial" CONF_SOFTWARE_SERIAL = "software_serial" CONF_HARDWARE_TYPE = "hardware_type" -CONF_RESOURCE = "resource" CONF_DOMAIN_DATA = "domain_data" CONF_CONNECTIONS = "connections" diff --git a/homeassistant/components/lcn/helpers.py b/homeassistant/components/lcn/helpers.py index e190b25eded..64a789f3a34 100644 --- a/homeassistant/components/lcn/helpers.py +++ b/homeassistant/components/lcn/helpers.py @@ -24,6 +24,7 @@ from homeassistant.const import ( CONF_NAME, CONF_PASSWORD, CONF_PORT, + CONF_RESOURCE, CONF_SENSORS, CONF_SOURCE, CONF_SWITCHES, @@ -42,7 +43,6 @@ from .const import ( CONF_HARDWARE_SERIAL, CONF_HARDWARE_TYPE, CONF_OUTPUT, - CONF_RESOURCE, CONF_SCENES, CONF_SK_NUM_TRIES, CONF_SOFTWARE_SERIAL, diff --git a/homeassistant/components/livisi/config_flow.py b/homeassistant/components/livisi/config_flow.py index 16cccaacfd1..c8685eb2390 100644 --- a/homeassistant/components/livisi/config_flow.py +++ b/homeassistant/components/livisi/config_flow.py @@ -9,10 +9,11 @@ from aiolivisi import AioLivisi, errors as livisi_errors import voluptuous as vol from homeassistant import config_entries +from homeassistant.const import CONF_HOST, CONF_PASSWORD from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import aiohttp_client -from .const import CONF_HOST, CONF_PASSWORD, DOMAIN, LOGGER +from .const import DOMAIN, LOGGER class LivisiFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/livisi/const.py b/homeassistant/components/livisi/const.py index f6435298f1e..2769e6030ee 100644 --- a/homeassistant/components/livisi/const.py +++ b/homeassistant/components/livisi/const.py @@ -5,8 +5,6 @@ from typing import Final LOGGER = logging.getLogger(__package__) DOMAIN = "livisi" -CONF_HOST = "host" -CONF_PASSWORD: Final = "password" AVATAR = "Avatar" AVATAR_PORT: Final = 9090 CLASSIC_PORT: Final = 8080 diff --git a/homeassistant/components/livisi/coordinator.py b/homeassistant/components/livisi/coordinator.py index 56e928307c1..17a3b1828d0 100644 --- a/homeassistant/components/livisi/coordinator.py +++ b/homeassistant/components/livisi/coordinator.py @@ -9,6 +9,7 @@ from aiolivisi import AioLivisi, LivisiEvent, Websocket from aiolivisi.errors import TokenExpiredException from homeassistant.config_entries import ConfigEntry +from homeassistant.const import CONF_HOST, CONF_PASSWORD from homeassistant.core import HomeAssistant from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed @@ -17,8 +18,6 @@ from .const import ( AVATAR, AVATAR_PORT, CLASSIC_PORT, - CONF_HOST, - CONF_PASSWORD, DEVICE_POLLING_DELAY, LIVISI_REACHABILITY_CHANGE, LIVISI_STATE_CHANGE, diff --git a/homeassistant/components/nextbus/__init__.py b/homeassistant/components/nextbus/__init__.py index e1f4dcc2840..e8c0bc224fe 100644 --- a/homeassistant/components/nextbus/__init__.py +++ b/homeassistant/components/nextbus/__init__.py @@ -1,10 +1,10 @@ """NextBus platform.""" from homeassistant.config_entries import ConfigEntry -from homeassistant.const import Platform +from homeassistant.const import CONF_STOP, Platform from homeassistant.core import HomeAssistant -from .const import CONF_AGENCY, CONF_ROUTE, CONF_STOP, DOMAIN +from .const import CONF_AGENCY, CONF_ROUTE, DOMAIN from .coordinator import NextBusDataUpdateCoordinator PLATFORMS = [Platform.SENSOR] diff --git a/homeassistant/components/nextbus/config_flow.py b/homeassistant/components/nextbus/config_flow.py index 84417a29c8d..a4045ada372 100644 --- a/homeassistant/components/nextbus/config_flow.py +++ b/homeassistant/components/nextbus/config_flow.py @@ -6,7 +6,7 @@ from py_nextbus import NextBusClient import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_NAME +from homeassistant.const import CONF_NAME, CONF_STOP from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.selector import ( SelectOptionDict, @@ -15,7 +15,7 @@ from homeassistant.helpers.selector import ( SelectSelectorMode, ) -from .const import CONF_AGENCY, CONF_ROUTE, CONF_STOP, DOMAIN +from .const import CONF_AGENCY, CONF_ROUTE, DOMAIN from .util import listify _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/nextbus/const.py b/homeassistant/components/nextbus/const.py index 9d9d0a5262f..0a2eabf57b3 100644 --- a/homeassistant/components/nextbus/const.py +++ b/homeassistant/components/nextbus/const.py @@ -3,4 +3,3 @@ DOMAIN = "nextbus" CONF_AGENCY = "agency" CONF_ROUTE = "route" -CONF_STOP = "stop" diff --git a/homeassistant/components/nextbus/sensor.py b/homeassistant/components/nextbus/sensor.py index 6ef647f98ad..f62bf07eeef 100644 --- a/homeassistant/components/nextbus/sensor.py +++ b/homeassistant/components/nextbus/sensor.py @@ -13,7 +13,7 @@ from homeassistant.components.sensor import ( SensorEntity, ) from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry -from homeassistant.const import CONF_NAME +from homeassistant.const import CONF_NAME, CONF_STOP from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -22,7 +22,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.util.dt import utc_from_timestamp -from .const import CONF_AGENCY, CONF_ROUTE, CONF_STOP, DOMAIN +from .const import CONF_AGENCY, CONF_ROUTE, DOMAIN from .coordinator import NextBusDataUpdateCoordinator from .util import listify, maybe_first diff --git a/homeassistant/components/nextdns/config_flow.py b/homeassistant/components/nextdns/config_flow.py index 3985644a478..c502f788a86 100644 --- a/homeassistant/components/nextdns/config_flow.py +++ b/homeassistant/components/nextdns/config_flow.py @@ -9,11 +9,11 @@ from nextdns import ApiError, InvalidApiKeyError, NextDns import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_API_KEY +from homeassistant.const import CONF_API_KEY, CONF_PROFILE_NAME from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.aiohttp_client import async_get_clientsession -from .const import CONF_PROFILE_ID, CONF_PROFILE_NAME, DOMAIN +from .const import CONF_PROFILE_ID, DOMAIN class NextDnsFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/nextdns/const.py b/homeassistant/components/nextdns/const.py index 8cac556c87c..031dd1c5814 100644 --- a/homeassistant/components/nextdns/const.py +++ b/homeassistant/components/nextdns/const.py @@ -10,7 +10,6 @@ ATTR_SETTINGS = "settings" ATTR_STATUS = "status" CONF_PROFILE_ID = "profile_id" -CONF_PROFILE_NAME = "profile_name" UPDATE_INTERVAL_CONNECTION = timedelta(minutes=5) UPDATE_INTERVAL_ANALYTICS = timedelta(minutes=10) diff --git a/homeassistant/components/openweathermap/__init__.py b/homeassistant/components/openweathermap/__init__.py index d462e34cd84..cfe28e2eacc 100644 --- a/homeassistant/components/openweathermap/__init__.py +++ b/homeassistant/components/openweathermap/__init__.py @@ -10,6 +10,7 @@ from pyowm.utils.config import get_default_config from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_API_KEY, + CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE, @@ -18,7 +19,6 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from .const import ( - CONF_LANGUAGE, CONFIG_FLOW_VERSION, DOMAIN, ENTRY_NAME, diff --git a/homeassistant/components/openweathermap/config_flow.py b/homeassistant/components/openweathermap/config_flow.py index c418231946f..799be35fb42 100644 --- a/homeassistant/components/openweathermap/config_flow.py +++ b/homeassistant/components/openweathermap/config_flow.py @@ -8,6 +8,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.const import ( CONF_API_KEY, + CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE, @@ -17,7 +18,6 @@ from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from .const import ( - CONF_LANGUAGE, CONFIG_FLOW_VERSION, DEFAULT_FORECAST_MODE, DEFAULT_LANGUAGE, diff --git a/homeassistant/components/openweathermap/const.py b/homeassistant/components/openweathermap/const.py index 1420b1170ca..d7deab21743 100644 --- a/homeassistant/components/openweathermap/const.py +++ b/homeassistant/components/openweathermap/const.py @@ -24,7 +24,6 @@ DEFAULT_NAME = "OpenWeatherMap" DEFAULT_LANGUAGE = "en" ATTRIBUTION = "Data provided by OpenWeatherMap" MANUFACTURER = "OpenWeather" -CONF_LANGUAGE = "language" CONFIG_FLOW_VERSION = 2 ENTRY_NAME = "name" ENTRY_WEATHER_COORDINATOR = "weather_coordinator" diff --git a/homeassistant/components/purpleair/__init__.py b/homeassistant/components/purpleair/__init__.py index 6b998f6879e..f52d0799d35 100644 --- a/homeassistant/components/purpleair/__init__.py +++ b/homeassistant/components/purpleair/__init__.py @@ -7,12 +7,17 @@ from typing import Any from aiopurpleair.models.sensors import SensorModel from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, Platform +from homeassistant.const import ( + ATTR_LATITUDE, + ATTR_LONGITUDE, + CONF_SHOW_ON_MAP, + Platform, +) from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.update_coordinator import CoordinatorEntity -from .const import CONF_SHOW_ON_MAP, DOMAIN +from .const import DOMAIN from .coordinator import PurpleAirDataUpdateCoordinator PLATFORMS = [Platform.SENSOR] diff --git a/homeassistant/components/purpleair/config_flow.py b/homeassistant/components/purpleair/config_flow.py index 3daa6f96fdf..e2b43726dc4 100644 --- a/homeassistant/components/purpleair/config_flow.py +++ b/homeassistant/components/purpleair/config_flow.py @@ -14,7 +14,12 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE +from homeassistant.const import ( + CONF_API_KEY, + CONF_LATITUDE, + CONF_LONGITUDE, + CONF_SHOW_ON_MAP, +) from homeassistant.core import HomeAssistant, callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import ( @@ -35,7 +40,7 @@ from homeassistant.helpers.selector import ( ) from homeassistant.helpers.typing import EventType -from .const import CONF_SENSOR_INDICES, CONF_SHOW_ON_MAP, DOMAIN, LOGGER +from .const import CONF_SENSOR_INDICES, DOMAIN, LOGGER CONF_DISTANCE = "distance" CONF_NEARBY_SENSOR_OPTIONS = "nearby_sensor_options" diff --git a/homeassistant/components/purpleair/const.py b/homeassistant/components/purpleair/const.py index e3ea7807a21..60f51a9e7dd 100644 --- a/homeassistant/components/purpleair/const.py +++ b/homeassistant/components/purpleair/const.py @@ -7,4 +7,3 @@ LOGGER = logging.getLogger(__package__) CONF_READ_KEY = "read_key" CONF_SENSOR_INDICES = "sensor_indices" -CONF_SHOW_ON_MAP = "show_on_map" diff --git a/homeassistant/components/rachio/__init__.py b/homeassistant/components/rachio/__init__.py index 8f9c9395ade..e47004f5fb7 100644 --- a/homeassistant/components/rachio/__init__.py +++ b/homeassistant/components/rachio/__init__.py @@ -7,12 +7,12 @@ from requests.exceptions import ConnectTimeout from homeassistant.components import cloud from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_API_KEY, Platform +from homeassistant.const import CONF_API_KEY, CONF_WEBHOOK_ID, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import config_validation as cv -from .const import CONF_CLOUDHOOK_URL, CONF_MANUAL_RUN_MINS, CONF_WEBHOOK_ID, DOMAIN +from .const import CONF_CLOUDHOOK_URL, CONF_MANUAL_RUN_MINS, DOMAIN from .device import RachioPerson from .webhooks import ( async_get_or_create_registered_webhook_id_and_url, diff --git a/homeassistant/components/rachio/const.py b/homeassistant/components/rachio/const.py index 92a57505a7c..dad044e5049 100644 --- a/homeassistant/components/rachio/const.py +++ b/homeassistant/components/rachio/const.py @@ -65,7 +65,6 @@ SIGNAL_RACHIO_RAIN_SENSOR_UPDATE = f"{SIGNAL_RACHIO_UPDATE}_rain_sensor" SIGNAL_RACHIO_ZONE_UPDATE = f"{SIGNAL_RACHIO_UPDATE}_zone" SIGNAL_RACHIO_SCHEDULE_UPDATE = f"{SIGNAL_RACHIO_UPDATE}_schedule" -CONF_WEBHOOK_ID = "webhook_id" CONF_CLOUDHOOK_URL = "cloudhook_url" # Webhook callbacks diff --git a/homeassistant/components/rachio/webhooks.py b/homeassistant/components/rachio/webhooks.py index 5c2fbe5965f..298b9c03701 100644 --- a/homeassistant/components/rachio/webhooks.py +++ b/homeassistant/components/rachio/webhooks.py @@ -5,13 +5,12 @@ from aiohttp import web from homeassistant.components import cloud, webhook from homeassistant.config_entries import ConfigEntry -from homeassistant.const import URL_API +from homeassistant.const import CONF_WEBHOOK_ID, URL_API from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_send from .const import ( CONF_CLOUDHOOK_URL, - CONF_WEBHOOK_ID, DOMAIN, KEY_EXTERNAL_ID, KEY_TYPE, diff --git a/homeassistant/components/reolink/config_flow.py b/homeassistant/components/reolink/config_flow.py index a27c84b9593..fc9b717f89b 100644 --- a/homeassistant/components/reolink/config_flow.py +++ b/homeassistant/components/reolink/config_flow.py @@ -10,13 +10,19 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import dhcp -from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME +from homeassistant.const import ( + CONF_HOST, + CONF_PASSWORD, + CONF_PORT, + CONF_PROTOCOL, + CONF_USERNAME, +) from homeassistant.core import callback from homeassistant.data_entry_flow import AbortFlow, FlowResult from homeassistant.helpers import config_validation as cv from homeassistant.helpers.device_registry import format_mac -from .const import CONF_PROTOCOL, CONF_USE_HTTPS, DOMAIN +from .const import CONF_USE_HTTPS, DOMAIN from .exceptions import ReolinkException, ReolinkWebhookException, UserNotAdmin from .host import ReolinkHost from .util import is_connected diff --git a/homeassistant/components/reolink/const.py b/homeassistant/components/reolink/const.py index 2a35a0f723d..8aa01bfac41 100644 --- a/homeassistant/components/reolink/const.py +++ b/homeassistant/components/reolink/const.py @@ -3,4 +3,3 @@ DOMAIN = "reolink" CONF_USE_HTTPS = "use_https" -CONF_PROTOCOL = "protocol" diff --git a/homeassistant/components/reolink/host.py b/homeassistant/components/reolink/host.py index dfc77806932..77aeffd5412 100644 --- a/homeassistant/components/reolink/host.py +++ b/homeassistant/components/reolink/host.py @@ -13,7 +13,13 @@ from reolink_aio.enums import SubType from reolink_aio.exceptions import NotSupportedError, ReolinkError, SubscriptionError from homeassistant.components import webhook -from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME +from homeassistant.const import ( + CONF_HOST, + CONF_PASSWORD, + CONF_PORT, + CONF_PROTOCOL, + CONF_USERNAME, +) from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant from homeassistant.helpers import issue_registry as ir from homeassistant.helpers.device_registry import format_mac @@ -21,7 +27,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.event import async_call_later from homeassistant.helpers.network import NoURLAvailableError, get_url -from .const import CONF_PROTOCOL, CONF_USE_HTTPS, DOMAIN +from .const import CONF_USE_HTTPS, DOMAIN from .exceptions import ReolinkSetupException, ReolinkWebhookException, UserNotAdmin DEFAULT_TIMEOUT = 30 diff --git a/homeassistant/components/totalconnect/const.py b/homeassistant/components/totalconnect/const.py index 5012a303b69..1e98adaaa70 100644 --- a/homeassistant/components/totalconnect/const.py +++ b/homeassistant/components/totalconnect/const.py @@ -2,7 +2,6 @@ DOMAIN = "totalconnect" CONF_USERCODES = "usercodes" -CONF_LOCATION = "location" AUTO_BYPASS = "auto_bypass_low_battery" # Most TotalConnect alarms will work passing '-1' as usercode diff --git a/homeassistant/components/trafikverket_camera/__init__.py b/homeassistant/components/trafikverket_camera/__init__.py index 3ac3ce35882..f0f758272f7 100644 --- a/homeassistant/components/trafikverket_camera/__init__.py +++ b/homeassistant/components/trafikverket_camera/__init__.py @@ -6,12 +6,12 @@ import logging from pytrafikverket.trafikverket_camera import TrafikverketCamera from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_API_KEY, CONF_ID +from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv from homeassistant.helpers.aiohttp_client import async_get_clientsession -from .const import CONF_LOCATION, DOMAIN, PLATFORMS +from .const import DOMAIN, PLATFORMS from .coordinator import TVDataUpdateCoordinator CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN) diff --git a/homeassistant/components/trafikverket_camera/config_flow.py b/homeassistant/components/trafikverket_camera/config_flow.py index 7572855b7d4..104a6a470dc 100644 --- a/homeassistant/components/trafikverket_camera/config_flow.py +++ b/homeassistant/components/trafikverket_camera/config_flow.py @@ -14,12 +14,12 @@ from pytrafikverket.trafikverket_camera import CameraInfo, TrafikverketCamera import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_API_KEY, CONF_ID +from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv -from .const import CONF_LOCATION, DOMAIN +from .const import DOMAIN class TVCameraConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/trafikverket_camera/const.py b/homeassistant/components/trafikverket_camera/const.py index ff40d1bbc91..728ba9f7bd5 100644 --- a/homeassistant/components/trafikverket_camera/const.py +++ b/homeassistant/components/trafikverket_camera/const.py @@ -2,7 +2,6 @@ from homeassistant.const import Platform DOMAIN = "trafikverket_camera" -CONF_LOCATION = "location" PLATFORMS = [Platform.BINARY_SENSOR, Platform.CAMERA, Platform.SENSOR] ATTRIBUTION = "Data provided by Trafikverket" diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py index d0ae13c09b7..ee084b77ef1 100644 --- a/homeassistant/components/tuya/__init__.py +++ b/homeassistant/components/tuya/__init__.py @@ -15,7 +15,7 @@ from tuya_iot import ( ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_COUNTRY_CODE +from homeassistant.const import CONF_COUNTRY_CODE, CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers import device_registry as dr @@ -27,8 +27,6 @@ from .const import ( CONF_APP_TYPE, CONF_AUTH_TYPE, CONF_ENDPOINT, - CONF_PASSWORD, - CONF_USERNAME, DOMAIN, LOGGER, PLATFORMS, diff --git a/homeassistant/components/tuya/config_flow.py b/homeassistant/components/tuya/config_flow.py index eb490791f7e..f933ac84519 100644 --- a/homeassistant/components/tuya/config_flow.py +++ b/homeassistant/components/tuya/config_flow.py @@ -7,7 +7,7 @@ from tuya_iot import AuthType, TuyaOpenAPI import voluptuous as vol from homeassistant import config_entries -from homeassistant.const import CONF_COUNTRY_CODE +from homeassistant.const import CONF_COUNTRY_CODE, CONF_PASSWORD, CONF_USERNAME from .const import ( CONF_ACCESS_ID, @@ -15,8 +15,6 @@ from .const import ( CONF_APP_TYPE, CONF_AUTH_TYPE, CONF_ENDPOINT, - CONF_PASSWORD, - CONF_USERNAME, DOMAIN, LOGGER, SMARTLIFE_APP, diff --git a/homeassistant/components/tuya/const.py b/homeassistant/components/tuya/const.py index 56dbbc4fa40..4cdca8f3904 100644 --- a/homeassistant/components/tuya/const.py +++ b/homeassistant/components/tuya/const.py @@ -36,8 +36,6 @@ CONF_PROJECT_TYPE = "tuya_project_type" CONF_ENDPOINT = "endpoint" CONF_ACCESS_ID = "access_id" CONF_ACCESS_SECRET = "access_secret" -CONF_USERNAME = "username" -CONF_PASSWORD = "password" CONF_APP_TYPE = "tuya_app_type" TUYA_DISCOVERY_NEW = "tuya_discovery_new" diff --git a/homeassistant/components/twinkly/__init__.py b/homeassistant/components/twinkly/__init__.py index 897bfaf4e20..d57a56f489b 100644 --- a/homeassistant/components/twinkly/__init__.py +++ b/homeassistant/components/twinkly/__init__.py @@ -6,12 +6,12 @@ from aiohttp import ClientError from ttls.client import Twinkly from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_SW_VERSION, Platform +from homeassistant.const import ATTR_SW_VERSION, CONF_HOST, Platform from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.aiohttp_client import async_get_clientsession -from .const import ATTR_VERSION, CONF_HOST, DATA_CLIENT, DATA_DEVICE_INFO, DOMAIN +from .const import ATTR_VERSION, DATA_CLIENT, DATA_DEVICE_INFO, DOMAIN PLATFORMS = [Platform.LIGHT] diff --git a/homeassistant/components/twinkly/config_flow.py b/homeassistant/components/twinkly/config_flow.py index eab44dba591..e37e0fd6170 100644 --- a/homeassistant/components/twinkly/config_flow.py +++ b/homeassistant/components/twinkly/config_flow.py @@ -11,10 +11,10 @@ from voluptuous import Required, Schema from homeassistant import config_entries, data_entry_flow from homeassistant.components import dhcp -from homeassistant.const import CONF_HOST, CONF_MODEL +from homeassistant.const import CONF_HOST, CONF_ID, CONF_MODEL, CONF_NAME from homeassistant.helpers.aiohttp_client import async_get_clientsession -from .const import CONF_ID, CONF_NAME, DEV_ID, DEV_MODEL, DEV_NAME, DOMAIN +from .const import DEV_ID, DEV_MODEL, DEV_NAME, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/twinkly/const.py b/homeassistant/components/twinkly/const.py index 2158e4aae07..f33024ed156 100644 --- a/homeassistant/components/twinkly/const.py +++ b/homeassistant/components/twinkly/const.py @@ -2,11 +2,6 @@ DOMAIN = "twinkly" -# Keys of the config entry -CONF_ID = "id" -CONF_HOST = "host" -CONF_NAME = "name" - # Strongly named HA attributes keys ATTR_HOST = "host" ATTR_VERSION = "version" diff --git a/homeassistant/components/twinkly/light.py b/homeassistant/components/twinkly/light.py index 6d0b31b06ed..c4301936088 100644 --- a/homeassistant/components/twinkly/light.py +++ b/homeassistant/components/twinkly/light.py @@ -19,16 +19,19 @@ from homeassistant.components.light import ( LightEntityFeature, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_SW_VERSION, CONF_MODEL +from homeassistant.const import ( + ATTR_SW_VERSION, + CONF_HOST, + CONF_ID, + CONF_MODEL, + CONF_NAME, +) from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( - CONF_HOST, - CONF_ID, - CONF_NAME, DATA_CLIENT, DATA_DEVICE_INFO, DEV_LED_PROFILE, diff --git a/homeassistant/components/watttime/config_flow.py b/homeassistant/components/watttime/config_flow.py index 4f4206da6ec..12601c0af83 100644 --- a/homeassistant/components/watttime/config_flow.py +++ b/homeassistant/components/watttime/config_flow.py @@ -14,6 +14,7 @@ from homeassistant.const import ( CONF_LATITUDE, CONF_LONGITUDE, CONF_PASSWORD, + CONF_SHOW_ON_MAP, CONF_USERNAME, ) from homeassistant.core import callback @@ -23,7 +24,6 @@ from homeassistant.helpers import aiohttp_client, config_validation as cv from .const import ( CONF_BALANCING_AUTHORITY, CONF_BALANCING_AUTHORITY_ABBREV, - CONF_SHOW_ON_MAP, DOMAIN, LOGGER, ) diff --git a/homeassistant/components/watttime/const.py b/homeassistant/components/watttime/const.py index 5bb8cb50d40..ce2731e7832 100644 --- a/homeassistant/components/watttime/const.py +++ b/homeassistant/components/watttime/const.py @@ -7,4 +7,3 @@ LOGGER = logging.getLogger(__package__) CONF_BALANCING_AUTHORITY = "balancing_authority" CONF_BALANCING_AUTHORITY_ABBREV = "balancing_authority_abbreviation" -CONF_SHOW_ON_MAP = "show_on_map" diff --git a/homeassistant/components/watttime/sensor.py b/homeassistant/components/watttime/sensor.py index 2a0e21ecf4c..ca5b0d06fa2 100644 --- a/homeassistant/components/watttime/sensor.py +++ b/homeassistant/components/watttime/sensor.py @@ -10,7 +10,13 @@ from homeassistant.components.sensor import ( SensorStateClass, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, PERCENTAGE, UnitOfMass +from homeassistant.const import ( + ATTR_LATITUDE, + ATTR_LONGITUDE, + CONF_SHOW_ON_MAP, + PERCENTAGE, + UnitOfMass, +) from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -20,12 +26,7 @@ from homeassistant.helpers.update_coordinator import ( DataUpdateCoordinator, ) -from .const import ( - CONF_BALANCING_AUTHORITY, - CONF_BALANCING_AUTHORITY_ABBREV, - CONF_SHOW_ON_MAP, - DOMAIN, -) +from .const import CONF_BALANCING_AUTHORITY, CONF_BALANCING_AUTHORITY_ABBREV, DOMAIN ATTR_BALANCING_AUTHORITY = "balancing_authority" diff --git a/homeassistant/components/xiaomi_miio/config_flow.py b/homeassistant/components/xiaomi_miio/config_flow.py index 2a4deffb161..02e88c6b14e 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_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN +from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MAC, CONF_MODEL, CONF_TOKEN from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.device_registry import format_mac @@ -25,7 +25,6 @@ from .const import ( CONF_CLOUD_USERNAME, CONF_FLOW_TYPE, CONF_GATEWAY, - CONF_MAC, CONF_MANUAL, DEFAULT_CLOUD_COUNTRY, DOMAIN, diff --git a/homeassistant/components/xiaomi_miio/const.py b/homeassistant/components/xiaomi_miio/const.py index 376c23c10d4..ef9668dbee4 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_MAC = "mac" CONF_CLOUD_USERNAME = "cloud_username" CONF_CLOUD_PASSWORD = "cloud_password" CONF_CLOUD_COUNTRY = "cloud_country" diff --git a/homeassistant/components/xiaomi_miio/device.py b/homeassistant/components/xiaomi_miio/device.py index da860c7045e..0c87f74a7e6 100644 --- a/homeassistant/components/xiaomi_miio/device.py +++ b/homeassistant/components/xiaomi_miio/device.py @@ -8,7 +8,7 @@ from typing import Any, TypeVar from construct.core import ChecksumError from miio import Device, DeviceException -from homeassistant.const import ATTR_CONNECTIONS, CONF_MODEL +from homeassistant.const import ATTR_CONNECTIONS, CONF_MAC, CONF_MODEL from homeassistant.helpers import device_registry as dr from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.entity import Entity @@ -17,7 +17,7 @@ from homeassistant.helpers.update_coordinator import ( DataUpdateCoordinator, ) -from .const import CONF_MAC, DOMAIN, AuthException, SetupException +from .const import DOMAIN, AuthException, SetupException _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/youtube/const.py b/homeassistant/components/youtube/const.py index 7404cd04665..63c4480c007 100644 --- a/homeassistant/components/youtube/const.py +++ b/homeassistant/components/youtube/const.py @@ -7,7 +7,6 @@ MANUFACTURER = "Google, Inc." CHANNEL_CREATION_HELP_URL = "https://support.google.com/youtube/answer/1646861" CONF_CHANNELS = "channels" -CONF_ID = "id" CONF_UPLOAD_PLAYLIST = "upload_playlist_id" COORDINATOR = "coordinator" AUTH = "auth" diff --git a/tests/components/airthings/test_config_flow.py b/tests/components/airthings/test_config_flow.py index 3a0c852535e..3228b3c7229 100644 --- a/tests/components/airthings/test_config_flow.py +++ b/tests/components/airthings/test_config_flow.py @@ -4,7 +4,8 @@ from unittest.mock import patch import airthings from homeassistant import config_entries -from homeassistant.components.airthings.const import CONF_ID, CONF_SECRET, DOMAIN +from homeassistant.components.airthings.const import CONF_SECRET, DOMAIN +from homeassistant.const import CONF_ID from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType diff --git a/tests/components/anthemav/conftest.py b/tests/components/anthemav/conftest.py index 7797f08872f..4c1abdd3c9b 100644 --- a/tests/components/anthemav/conftest.py +++ b/tests/components/anthemav/conftest.py @@ -4,8 +4,8 @@ from unittest.mock import AsyncMock, MagicMock, patch import pytest -from homeassistant.components.anthemav.const import CONF_MODEL, DOMAIN -from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PORT +from homeassistant.components.anthemav.const import DOMAIN +from homeassistant.const import CONF_HOST, CONF_MAC, CONF_MODEL, CONF_PORT from homeassistant.core import HomeAssistant from tests.common import MockConfigEntry diff --git a/tests/components/environment_canada/test_config_flow.py b/tests/components/environment_canada/test_config_flow.py index e3058697f3e..b745ac02693 100644 --- a/tests/components/environment_canada/test_config_flow.py +++ b/tests/components/environment_canada/test_config_flow.py @@ -6,12 +6,8 @@ import aiohttp import pytest from homeassistant import config_entries, data_entry_flow -from homeassistant.components.environment_canada.const import ( - CONF_LANGUAGE, - CONF_STATION, - DOMAIN, -) -from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE +from homeassistant.components.environment_canada.const import CONF_STATION, DOMAIN +from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE from homeassistant.core import HomeAssistant from tests.common import MockConfigEntry diff --git a/tests/components/environment_canada/test_diagnostics.py b/tests/components/environment_canada/test_diagnostics.py index 3eedb7a0ddb..fb1597e3622 100644 --- a/tests/components/environment_canada/test_diagnostics.py +++ b/tests/components/environment_canada/test_diagnostics.py @@ -5,12 +5,8 @@ from unittest.mock import AsyncMock, MagicMock, patch from syrupy import SnapshotAssertion -from homeassistant.components.environment_canada.const import ( - CONF_LANGUAGE, - CONF_STATION, - DOMAIN, -) -from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE +from homeassistant.components.environment_canada.const import CONF_STATION, DOMAIN +from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE from homeassistant.core import HomeAssistant from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/flux_led/test_light.py b/tests/components/flux_led/test_light.py index 974a029d143..6ddb9e1687f 100644 --- a/tests/components/flux_led/test_light.py +++ b/tests/components/flux_led/test_light.py @@ -23,7 +23,6 @@ from homeassistant.components.flux_led.const import ( CONF_CUSTOM_EFFECT_COLORS, CONF_CUSTOM_EFFECT_SPEED_PCT, CONF_CUSTOM_EFFECT_TRANSITION, - CONF_EFFECT, CONF_SPEED_PCT, CONF_TRANSITION, CONF_WHITE_CHANNEL_TYPE, @@ -55,6 +54,7 @@ from homeassistant.components.light import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + CONF_EFFECT, CONF_HOST, CONF_MODE, CONF_NAME, diff --git a/tests/components/frontier_silicon/conftest.py b/tests/components/frontier_silicon/conftest.py index 40a6df85310..1def9b160b2 100644 --- a/tests/components/frontier_silicon/conftest.py +++ b/tests/components/frontier_silicon/conftest.py @@ -4,11 +4,8 @@ from unittest.mock import AsyncMock, patch import pytest -from homeassistant.components.frontier_silicon.const import ( - CONF_PIN, - CONF_WEBFSAPI_URL, - DOMAIN, -) +from homeassistant.components.frontier_silicon.const import CONF_WEBFSAPI_URL, DOMAIN +from homeassistant.const import CONF_PIN from tests.common import MockConfigEntry diff --git a/tests/components/google_travel_time/test_config_flow.py b/tests/components/google_travel_time/test_config_flow.py index 15132baf25a..9e575389e72 100644 --- a/tests/components/google_travel_time/test_config_flow.py +++ b/tests/components/google_travel_time/test_config_flow.py @@ -8,7 +8,6 @@ from homeassistant.components.google_travel_time.const import ( CONF_AVOID, CONF_DEPARTURE_TIME, CONF_DESTINATION, - CONF_LANGUAGE, CONF_ORIGIN, CONF_TIME, CONF_TIME_TYPE, @@ -21,7 +20,7 @@ from homeassistant.components.google_travel_time.const import ( DOMAIN, UNITS_IMPERIAL, ) -from homeassistant.const import CONF_API_KEY, CONF_MODE, CONF_NAME +from homeassistant.const import CONF_API_KEY, CONF_LANGUAGE, CONF_MODE, CONF_NAME from homeassistant.core import HomeAssistant from .const import MOCK_CONFIG diff --git a/tests/components/knx/test_button.py b/tests/components/knx/test_button.py index a905e66fe5d..3dedea7d8d4 100644 --- a/tests/components/knx/test_button.py +++ b/tests/components/knx/test_button.py @@ -4,14 +4,9 @@ import logging import pytest -from homeassistant.components.knx.const import ( - CONF_PAYLOAD, - CONF_PAYLOAD_LENGTH, - DOMAIN, - KNX_ADDRESS, -) +from homeassistant.components.knx.const import CONF_PAYLOAD_LENGTH, DOMAIN, KNX_ADDRESS from homeassistant.components.knx.schema import ButtonSchema -from homeassistant.const import CONF_NAME, CONF_TYPE +from homeassistant.const import CONF_NAME, CONF_PAYLOAD, CONF_TYPE from homeassistant.core import HomeAssistant from homeassistant.util import dt as dt_util diff --git a/tests/components/knx/test_select.py b/tests/components/knx/test_select.py index 1c89338920e..f113a83f7a0 100644 --- a/tests/components/knx/test_select.py +++ b/tests/components/knx/test_select.py @@ -2,7 +2,6 @@ import pytest from homeassistant.components.knx.const import ( - CONF_PAYLOAD, CONF_PAYLOAD_LENGTH, CONF_RESPOND_TO_READ, CONF_STATE_ADDRESS, @@ -10,7 +9,7 @@ from homeassistant.components.knx.const import ( KNX_ADDRESS, ) from homeassistant.components.knx.schema import SelectSchema -from homeassistant.const import CONF_NAME, STATE_UNKNOWN +from homeassistant.const import CONF_NAME, CONF_PAYLOAD, STATE_UNKNOWN from homeassistant.core import HomeAssistant, State from .conftest import KNXTestKit diff --git a/tests/components/livisi/__init__.py b/tests/components/livisi/__init__.py index 3d28d1db708..48a7e21ad8d 100644 --- a/tests/components/livisi/__init__.py +++ b/tests/components/livisi/__init__.py @@ -1,7 +1,7 @@ """Tests for the LIVISI Smart Home integration.""" from unittest.mock import patch -from homeassistant.components.livisi.const import CONF_HOST, CONF_PASSWORD +from homeassistant.const import CONF_HOST, CONF_PASSWORD VALID_CONFIG = { CONF_HOST: "1.1.1.1", diff --git a/tests/components/nextbus/test_config_flow.py b/tests/components/nextbus/test_config_flow.py index 9f427757183..0b67f817eb2 100644 --- a/tests/components/nextbus/test_config_flow.py +++ b/tests/components/nextbus/test_config_flow.py @@ -5,13 +5,8 @@ from unittest.mock import MagicMock, patch import pytest from homeassistant import config_entries, setup -from homeassistant.components.nextbus.const import ( - CONF_AGENCY, - CONF_ROUTE, - CONF_STOP, - DOMAIN, -) -from homeassistant.const import CONF_NAME +from homeassistant.components.nextbus.const import CONF_AGENCY, CONF_ROUTE, DOMAIN +from homeassistant.const import CONF_NAME, CONF_STOP from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType diff --git a/tests/components/nextbus/test_sensor.py b/tests/components/nextbus/test_sensor.py index a4d04997e15..92da27783bc 100644 --- a/tests/components/nextbus/test_sensor.py +++ b/tests/components/nextbus/test_sensor.py @@ -8,15 +8,10 @@ from py_nextbus.client import NextBusFormatError, NextBusHTTPError, RouteStop import pytest from homeassistant.components import sensor -from homeassistant.components.nextbus.const import ( - CONF_AGENCY, - CONF_ROUTE, - CONF_STOP, - DOMAIN, -) +from homeassistant.components.nextbus.const import CONF_AGENCY, CONF_ROUTE, DOMAIN from homeassistant.components.nextbus.coordinator import NextBusDataUpdateCoordinator from homeassistant.config_entries import ConfigEntryState -from homeassistant.const import CONF_NAME +from homeassistant.const import CONF_NAME, CONF_STOP from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant from homeassistant.helpers import entity_registry as er, issue_registry as ir from homeassistant.helpers.update_coordinator import UpdateFailed diff --git a/tests/components/nextdns/test_config_flow.py b/tests/components/nextdns/test_config_flow.py index b5d718b61aa..a27898629ad 100644 --- a/tests/components/nextdns/test_config_flow.py +++ b/tests/components/nextdns/test_config_flow.py @@ -6,13 +6,9 @@ from nextdns import ApiError, InvalidApiKeyError import pytest from homeassistant import data_entry_flow -from homeassistant.components.nextdns.const import ( - CONF_PROFILE_ID, - CONF_PROFILE_NAME, - DOMAIN, -) +from homeassistant.components.nextdns.const import CONF_PROFILE_ID, DOMAIN from homeassistant.config_entries import SOURCE_USER -from homeassistant.const import CONF_API_KEY +from homeassistant.const import CONF_API_KEY, CONF_PROFILE_NAME from homeassistant.core import HomeAssistant from . import PROFILES, init_integration diff --git a/tests/components/openweathermap/test_config_flow.py b/tests/components/openweathermap/test_config_flow.py index 2bd62936fe5..87f76817044 100644 --- a/tests/components/openweathermap/test_config_flow.py +++ b/tests/components/openweathermap/test_config_flow.py @@ -5,7 +5,6 @@ from pyowm.commons.exceptions import APIRequestError, UnauthorizedError from homeassistant import data_entry_flow from homeassistant.components.openweathermap.const import ( - CONF_LANGUAGE, DEFAULT_FORECAST_MODE, DEFAULT_LANGUAGE, DOMAIN, @@ -13,6 +12,7 @@ from homeassistant.components.openweathermap.const import ( from homeassistant.config_entries import SOURCE_USER, ConfigEntryState from homeassistant.const import ( CONF_API_KEY, + CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE, diff --git a/tests/components/reolink/conftest.py b/tests/components/reolink/conftest.py index 464d4120c65..3f81a30f898 100644 --- a/tests/components/reolink/conftest.py +++ b/tests/components/reolink/conftest.py @@ -6,7 +6,13 @@ import pytest from homeassistant.components.reolink import const from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL -from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME +from homeassistant.const import ( + CONF_HOST, + CONF_PASSWORD, + CONF_PORT, + CONF_PROTOCOL, + CONF_USERNAME, +) from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import format_mac @@ -121,7 +127,7 @@ def config_entry(hass: HomeAssistant) -> MockConfigEntry: const.CONF_USE_HTTPS: TEST_USE_HTTPS, }, options={ - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, }, title=TEST_NVR_NAME, ) diff --git a/tests/components/reolink/test_config_flow.py b/tests/components/reolink/test_config_flow.py index 9b449d4b851..dd9949a5dce 100644 --- a/tests/components/reolink/test_config_flow.py +++ b/tests/components/reolink/test_config_flow.py @@ -14,7 +14,13 @@ from homeassistant.components.reolink.config_flow import DEFAULT_PROTOCOL from homeassistant.components.reolink.exceptions import ReolinkWebhookException from homeassistant.components.reolink.host import DEFAULT_TIMEOUT from homeassistant.config_entries import ConfigEntryState -from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME +from homeassistant.const import ( + CONF_HOST, + CONF_PASSWORD, + CONF_PORT, + CONF_PROTOCOL, + CONF_USERNAME, +) from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import format_mac from homeassistant.util.dt import utcnow @@ -68,7 +74,7 @@ async def test_config_flow_manual_success( const.CONF_USE_HTTPS: TEST_USE_HTTPS, } assert result["options"] == { - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, } @@ -195,7 +201,7 @@ async def test_config_flow_errors( const.CONF_USE_HTTPS: TEST_USE_HTTPS, } assert result["options"] == { - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, } @@ -212,7 +218,7 @@ async def test_options_flow(hass: HomeAssistant, mock_setup_entry: MagicMock) -> const.CONF_USE_HTTPS: TEST_USE_HTTPS, }, options={ - const.CONF_PROTOCOL: "rtsp", + CONF_PROTOCOL: "rtsp", }, title=TEST_NVR_NAME, ) @@ -228,12 +234,12 @@ async def test_options_flow(hass: HomeAssistant, mock_setup_entry: MagicMock) -> result = await hass.config_entries.options.async_configure( result["flow_id"], - user_input={const.CONF_PROTOCOL: "rtmp"}, + user_input={CONF_PROTOCOL: "rtmp"}, ) assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY assert config_entry.options == { - const.CONF_PROTOCOL: "rtmp", + CONF_PROTOCOL: "rtmp", } @@ -252,7 +258,7 @@ async def test_change_connection_settings( const.CONF_USE_HTTPS: TEST_USE_HTTPS, }, options={ - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, }, title=TEST_NVR_NAME, ) @@ -295,7 +301,7 @@ async def test_reauth(hass: HomeAssistant, mock_setup_entry: MagicMock) -> None: const.CONF_USE_HTTPS: TEST_USE_HTTPS, }, options={ - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, }, title=TEST_NVR_NAME, ) @@ -376,7 +382,7 @@ async def test_dhcp_flow(hass: HomeAssistant, mock_setup_entry: MagicMock) -> No const.CONF_USE_HTTPS: TEST_USE_HTTPS, } assert result["options"] == { - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, } @@ -435,7 +441,7 @@ async def test_dhcp_ip_update( const.CONF_USE_HTTPS: TEST_USE_HTTPS, }, options={ - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, }, title=TEST_NVR_NAME, ) diff --git a/tests/components/reolink/test_media_source.py b/tests/components/reolink/test_media_source.py index 7fe3570564a..ddb66463419 100644 --- a/tests/components/reolink/test_media_source.py +++ b/tests/components/reolink/test_media_source.py @@ -21,6 +21,7 @@ from homeassistant.const import ( CONF_HOST, CONF_PASSWORD, CONF_PORT, + CONF_PROTOCOL, CONF_USERNAME, Platform, ) @@ -271,7 +272,7 @@ async def test_browsing_not_loaded( const.CONF_USE_HTTPS: TEST_USE_HTTPS, }, options={ - const.CONF_PROTOCOL: DEFAULT_PROTOCOL, + CONF_PROTOCOL: DEFAULT_PROTOCOL, }, title=TEST_NVR_NAME2, ) diff --git a/tests/components/trafikverket_camera/__init__.py b/tests/components/trafikverket_camera/__init__.py index a9aa3ad70d1..dd23c7bce7e 100644 --- a/tests/components/trafikverket_camera/__init__.py +++ b/tests/components/trafikverket_camera/__init__.py @@ -1,8 +1,7 @@ """Tests for the Trafikverket Camera integration.""" from __future__ import annotations -from homeassistant.components.trafikverket_camera.const import CONF_LOCATION -from homeassistant.const import CONF_API_KEY, CONF_ID +from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION ENTRY_CONFIG = { CONF_API_KEY: "1234567890", diff --git a/tests/components/trafikverket_camera/test_config_flow.py b/tests/components/trafikverket_camera/test_config_flow.py index 305066832e5..ca1d8554c4a 100644 --- a/tests/components/trafikverket_camera/test_config_flow.py +++ b/tests/components/trafikverket_camera/test_config_flow.py @@ -13,8 +13,8 @@ from pytrafikverket.exceptions import ( from pytrafikverket.trafikverket_camera import CameraInfo from homeassistant import config_entries -from homeassistant.components.trafikverket_camera.const import CONF_LOCATION, DOMAIN -from homeassistant.const import CONF_API_KEY, CONF_ID +from homeassistant.components.trafikverket_camera.const import DOMAIN +from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType diff --git a/tests/components/tuya/test_config_flow.py b/tests/components/tuya/test_config_flow.py index 9505e1ef423..f8345683d4a 100644 --- a/tests/components/tuya/test_config_flow.py +++ b/tests/components/tuya/test_config_flow.py @@ -14,14 +14,12 @@ from homeassistant.components.tuya.const import ( CONF_APP_TYPE, CONF_AUTH_TYPE, CONF_ENDPOINT, - CONF_PASSWORD, - CONF_USERNAME, DOMAIN, SMARTLIFE_APP, TUYA_COUNTRIES, TUYA_SMART_APP, ) -from homeassistant.const import CONF_COUNTRY_CODE +from homeassistant.const import CONF_COUNTRY_CODE, CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant MOCK_SMART_HOME_PROJECT_TYPE = 0 diff --git a/tests/components/twinkly/__init__.py b/tests/components/twinkly/__init__.py index bd51ac5d7cd..4b1411e9223 100644 --- a/tests/components/twinkly/__init__.py +++ b/tests/components/twinkly/__init__.py @@ -1,4 +1,4 @@ -"""Constants and mock for the twkinly component tests.""" +"""Constants and mock for the twinkly component tests.""" from aiohttp.client_exceptions import ClientConnectionError diff --git a/tests/components/twinkly/test_config_flow.py b/tests/components/twinkly/test_config_flow.py index 2d335c69923..a65a2a2d963 100644 --- a/tests/components/twinkly/test_config_flow.py +++ b/tests/components/twinkly/test_config_flow.py @@ -3,13 +3,8 @@ from unittest.mock import patch from homeassistant import config_entries from homeassistant.components import dhcp -from homeassistant.components.twinkly.const import ( - CONF_HOST, - CONF_ID, - CONF_NAME, - DOMAIN as TWINKLY_DOMAIN, -) -from homeassistant.const import CONF_MODEL +from homeassistant.components.twinkly.const import DOMAIN as TWINKLY_DOMAIN +from homeassistant.const import CONF_HOST, CONF_ID, CONF_MODEL, CONF_NAME from homeassistant.core import HomeAssistant from . import TEST_MODEL, TEST_NAME, ClientMock diff --git a/tests/components/twinkly/test_init.py b/tests/components/twinkly/test_init.py index f2049f9b513..33f24a31d8f 100644 --- a/tests/components/twinkly/test_init.py +++ b/tests/components/twinkly/test_init.py @@ -3,14 +3,9 @@ from unittest.mock import patch from uuid import uuid4 -from homeassistant.components.twinkly.const import ( - CONF_HOST, - CONF_ID, - CONF_NAME, - DOMAIN as TWINKLY_DOMAIN, -) +from homeassistant.components.twinkly.const import DOMAIN as TWINKLY_DOMAIN from homeassistant.config_entries import ConfigEntryState -from homeassistant.const import CONF_MODEL +from homeassistant.const import CONF_HOST, CONF_ID, CONF_MODEL, CONF_NAME from homeassistant.core import HomeAssistant from . import TEST_HOST, TEST_MODEL, TEST_NAME_ORIGINAL, ClientMock diff --git a/tests/components/twinkly/test_light.py b/tests/components/twinkly/test_light.py index bcb40f22d08..e3b8b499c8e 100644 --- a/tests/components/twinkly/test_light.py +++ b/tests/components/twinkly/test_light.py @@ -4,13 +4,8 @@ from __future__ import annotations from unittest.mock import patch from homeassistant.components.light import ATTR_BRIGHTNESS, LightEntityFeature -from homeassistant.components.twinkly.const import ( - CONF_HOST, - CONF_ID, - CONF_NAME, - DOMAIN as TWINKLY_DOMAIN, -) -from homeassistant.const import CONF_MODEL +from homeassistant.components.twinkly.const import DOMAIN as TWINKLY_DOMAIN +from homeassistant.const import CONF_HOST, CONF_ID, CONF_MODEL, CONF_NAME from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers.device_registry import DeviceEntry diff --git a/tests/components/watttime/test_config_flow.py b/tests/components/watttime/test_config_flow.py index dbe1e5444d7..ce9284924f5 100644 --- a/tests/components/watttime/test_config_flow.py +++ b/tests/components/watttime/test_config_flow.py @@ -12,13 +12,13 @@ from homeassistant.components.watttime.config_flow import ( from homeassistant.components.watttime.const import ( CONF_BALANCING_AUTHORITY, CONF_BALANCING_AUTHORITY_ABBREV, - CONF_SHOW_ON_MAP, DOMAIN, ) from homeassistant.const import ( CONF_LATITUDE, CONF_LONGITUDE, CONF_PASSWORD, + CONF_SHOW_ON_MAP, CONF_USERNAME, ) from homeassistant.core import HomeAssistant diff --git a/tests/components/xiaomi_miio/test_button.py b/tests/components/xiaomi_miio/test_button.py index d00b2ec5853..552b302aafe 100644 --- a/tests/components/xiaomi_miio/test_button.py +++ b/tests/components/xiaomi_miio/test_button.py @@ -6,7 +6,6 @@ import pytest from homeassistant.components.button import DOMAIN, SERVICE_PRESS from homeassistant.components.xiaomi_miio.const import ( CONF_FLOW_TYPE, - CONF_MAC, DOMAIN as XIAOMI_DOMAIN, MODELS_VACUUM, ) @@ -14,6 +13,7 @@ from homeassistant.const import ( ATTR_ENTITY_ID, CONF_DEVICE, CONF_HOST, + CONF_MAC, CONF_MODEL, CONF_TOKEN, Platform, diff --git a/tests/components/xiaomi_miio/test_config_flow.py b/tests/components/xiaomi_miio/test_config_flow.py index 0fe8c3d247c..b36924764fe 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_DEVICE, CONF_HOST, CONF_MODEL, CONF_TOKEN +from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_MAC, CONF_MODEL, CONF_TOKEN from homeassistant.core import HomeAssistant from . import TEST_MAC @@ -172,7 +172,7 @@ async def test_config_flow_gateway_success(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } @@ -205,7 +205,7 @@ async def test_config_flow_gateway_cloud_success(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } @@ -251,7 +251,7 @@ async def test_config_flow_gateway_cloud_multiple_success(hass: HomeAssistant) - CONF_HOST: TEST_HOST2, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC2, + CONF_MAC: TEST_MAC2, } @@ -460,7 +460,7 @@ async def test_zeroconf_gateway_success(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } @@ -692,7 +692,7 @@ async def test_config_flow_step_device_manual_model_succes(hass: HomeAssistant) CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: overwrite_model, - const.CONF_MAC: None, + CONF_MAC: None, } @@ -736,7 +736,7 @@ async def config_flow_device_success(hass, model_to_test): CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: model_to_test, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } @@ -782,7 +782,7 @@ async def config_flow_generic_roborock(hass): CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: dummy_model, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } @@ -836,7 +836,7 @@ async def zeroconf_device_success(hass, zeroconf_name_to_test, model_to_test): CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: model_to_test, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } @@ -879,7 +879,7 @@ async def test_options_flow(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, }, title=TEST_NAME, ) @@ -919,7 +919,7 @@ async def test_options_flow_incomplete(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, }, title=TEST_NAME, ) @@ -957,7 +957,7 @@ async def test_reauth(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, }, title=TEST_NAME, ) @@ -1005,5 +1005,5 @@ async def test_reauth(hass: HomeAssistant) -> None: CONF_HOST: TEST_HOST, CONF_TOKEN: TEST_TOKEN, CONF_MODEL: TEST_MODEL, - const.CONF_MAC: TEST_MAC, + CONF_MAC: TEST_MAC, } diff --git a/tests/components/xiaomi_miio/test_select.py b/tests/components/xiaomi_miio/test_select.py index 04cb6ee6ea7..a999f0e7c9a 100644 --- a/tests/components/xiaomi_miio/test_select.py +++ b/tests/components/xiaomi_miio/test_select.py @@ -18,7 +18,6 @@ from homeassistant.components.select import ( from homeassistant.components.xiaomi_miio import UPDATE_INTERVAL from homeassistant.components.xiaomi_miio.const import ( CONF_FLOW_TYPE, - CONF_MAC, DOMAIN as XIAOMI_DOMAIN, MODEL_AIRFRESH_T2017, ) @@ -26,6 +25,7 @@ from homeassistant.const import ( ATTR_ENTITY_ID, CONF_DEVICE, CONF_HOST, + CONF_MAC, CONF_MODEL, CONF_TOKEN, Platform, diff --git a/tests/components/xiaomi_miio/test_vacuum.py b/tests/components/xiaomi_miio/test_vacuum.py index e1f2233c5bc..9e823035dd9 100644 --- a/tests/components/xiaomi_miio/test_vacuum.py +++ b/tests/components/xiaomi_miio/test_vacuum.py @@ -24,7 +24,6 @@ from homeassistant.components.vacuum import ( ) from homeassistant.components.xiaomi_miio.const import ( CONF_FLOW_TYPE, - CONF_MAC, DOMAIN as XIAOMI_DOMAIN, MODELS_VACUUM, ) @@ -44,6 +43,7 @@ from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, CONF_HOST, + CONF_MAC, CONF_MODEL, CONF_TOKEN, STATE_UNAVAILABLE,