From 75e04f3a713b6fab3ff4839cd1006280302b7bdf Mon Sep 17 00:00:00 2001 From: tkdrob Date: Mon, 22 Feb 2021 09:28:08 -0500 Subject: [PATCH] Clean up constants (#46885) --- homeassistant/components/air_quality/__init__.py | 6 ++++-- homeassistant/components/channels/media_player.py | 5 +---- homeassistant/components/comfoconnect/sensor.py | 2 +- homeassistant/components/facebox/image_processing.py | 2 +- homeassistant/components/hassio/const.py | 1 - homeassistant/components/hassio/discovery.py | 11 ++--------- .../components/homematicip_cloud/generic_entity.py | 2 +- homeassistant/components/netatmo/const.py | 1 - homeassistant/components/netatmo/webhook.py | 2 +- homeassistant/components/nightscout/const.py | 1 - homeassistant/components/nightscout/sensor.py | 3 ++- homeassistant/components/rachio/switch.py | 3 +-- homeassistant/components/reddit/sensor.py | 2 +- homeassistant/components/traccar/__init__.py | 8 ++++++-- homeassistant/components/traccar/const.py | 1 - .../components/usgs_earthquakes_feed/geo_location.py | 2 +- homeassistant/components/watson_tts/tts.py | 1 - homeassistant/components/zwave_js/__init__.py | 3 +-- homeassistant/components/zwave_js/const.py | 1 - tests/components/dynalite/common.py | 2 +- tests/components/nightscout/test_sensor.py | 3 +-- 21 files changed, 25 insertions(+), 37 deletions(-) diff --git a/homeassistant/components/air_quality/__init__.py b/homeassistant/components/air_quality/__init__.py index 48423d08e69..52c9208854a 100644 --- a/homeassistant/components/air_quality/__init__.py +++ b/homeassistant/components/air_quality/__init__.py @@ -2,7 +2,10 @@ from datetime import timedelta import logging -from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER +from homeassistant.const import ( + ATTR_ATTRIBUTION, + CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, +) from homeassistant.helpers.config_validation import ( # noqa: F401 PLATFORM_SCHEMA, PLATFORM_SCHEMA_BASE, @@ -13,7 +16,6 @@ from homeassistant.helpers.entity_component import EntityComponent _LOGGER = logging.getLogger(__name__) ATTR_AQI = "air_quality_index" -ATTR_ATTRIBUTION = "attribution" ATTR_CO2 = "carbon_dioxide" ATTR_CO = "carbon_monoxide" ATTR_N2O = "nitrogen_oxide" diff --git a/homeassistant/components/channels/media_player.py b/homeassistant/components/channels/media_player.py index 481cdd7ecad..5376dc3fe97 100644 --- a/homeassistant/components/channels/media_player.py +++ b/homeassistant/components/channels/media_player.py @@ -18,6 +18,7 @@ from homeassistant.components.media_player.const import ( SUPPORT_VOLUME_MUTE, ) from homeassistant.const import ( + ATTR_SECONDS, CONF_HOST, CONF_NAME, CONF_PORT, @@ -53,10 +54,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( ) -# Service call validation schemas -ATTR_SECONDS = "seconds" - - async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Channels platform.""" device = ChannelsPlayer(config[CONF_NAME], config[CONF_HOST], config[CONF_PORT]) diff --git a/homeassistant/components/comfoconnect/sensor.py b/homeassistant/components/comfoconnect/sensor.py index 53075beecaf..660228b0b8d 100644 --- a/homeassistant/components/comfoconnect/sensor.py +++ b/homeassistant/components/comfoconnect/sensor.py @@ -29,6 +29,7 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( ATTR_DEVICE_CLASS, + ATTR_ID, CONF_RESOURCES, DEVICE_CLASS_ENERGY, DEVICE_CLASS_HUMIDITY, @@ -72,7 +73,6 @@ ATTR_SUPPLY_TEMPERATURE = "supply_temperature" _LOGGER = logging.getLogger(__name__) ATTR_ICON = "icon" -ATTR_ID = "id" ATTR_LABEL = "label" ATTR_MULTIPLIER = "multiplier" ATTR_UNIT = "unit" diff --git a/homeassistant/components/facebox/image_processing.py b/homeassistant/components/facebox/image_processing.py index ee6e4d8a6fa..6a460ac305b 100644 --- a/homeassistant/components/facebox/image_processing.py +++ b/homeassistant/components/facebox/image_processing.py @@ -15,6 +15,7 @@ from homeassistant.components.image_processing import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + ATTR_ID, ATTR_NAME, CONF_IP_ADDRESS, CONF_PASSWORD, @@ -34,7 +35,6 @@ _LOGGER = logging.getLogger(__name__) ATTR_BOUNDING_BOX = "bounding_box" ATTR_CLASSIFIER = "classifier" ATTR_IMAGE_ID = "image_id" -ATTR_ID = "id" ATTR_MATCHED = "matched" FACEBOX_NAME = "name" CLASSIFIER = "facebox" diff --git a/homeassistant/components/hassio/const.py b/homeassistant/components/hassio/const.py index 00893f83401..0cb1649dfc5 100644 --- a/homeassistant/components/hassio/const.py +++ b/homeassistant/components/hassio/const.py @@ -16,7 +16,6 @@ ATTR_INPUT = "input" ATTR_NAME = "name" ATTR_PANELS = "panels" ATTR_PASSWORD = "password" -ATTR_SERVICE = "service" ATTR_SNAPSHOT = "snapshot" ATTR_TITLE = "title" ATTR_USERNAME = "username" diff --git a/homeassistant/components/hassio/discovery.py b/homeassistant/components/hassio/discovery.py index f3337254f1a..cda05eccbec 100644 --- a/homeassistant/components/hassio/discovery.py +++ b/homeassistant/components/hassio/discovery.py @@ -6,17 +6,10 @@ from aiohttp import web from aiohttp.web_exceptions import HTTPServiceUnavailable from homeassistant.components.http import HomeAssistantView -from homeassistant.const import EVENT_HOMEASSISTANT_START +from homeassistant.const import ATTR_SERVICE, EVENT_HOMEASSISTANT_START from homeassistant.core import callback -from .const import ( - ATTR_ADDON, - ATTR_CONFIG, - ATTR_DISCOVERY, - ATTR_NAME, - ATTR_SERVICE, - ATTR_UUID, -) +from .const import ATTR_ADDON, ATTR_CONFIG, ATTR_DISCOVERY, ATTR_NAME, ATTR_UUID from .handler import HassioAPIError _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/homematicip_cloud/generic_entity.py b/homeassistant/components/homematicip_cloud/generic_entity.py index 65e5ade7d1d..a1e13658d20 100644 --- a/homeassistant/components/homematicip_cloud/generic_entity.py +++ b/homeassistant/components/homematicip_cloud/generic_entity.py @@ -5,6 +5,7 @@ from typing import Any, Dict, Optional from homematicip.aio.device import AsyncDevice from homematicip.aio.group import AsyncGroup +from homeassistant.const import ATTR_ID from homeassistant.core import callback from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers.entity import Entity @@ -19,7 +20,6 @@ ATTR_LOW_BATTERY = "low_battery" ATTR_CONFIG_PENDING = "config_pending" ATTR_CONNECTION_TYPE = "connection_type" ATTR_DUTY_CYCLE_REACHED = "duty_cycle_reached" -ATTR_ID = "id" ATTR_IS_GROUP = "is_group" # RSSI HAP -> Device ATTR_RSSI_DEVICE = "rssi_device" diff --git a/homeassistant/components/netatmo/const.py b/homeassistant/components/netatmo/const.py index ed1c5f0a880..4c3650ef121 100644 --- a/homeassistant/components/netatmo/const.py +++ b/homeassistant/components/netatmo/const.py @@ -56,7 +56,6 @@ DEFAULT_PERSON = "Unknown" DEFAULT_DISCOVERY = True DEFAULT_WEBHOOKS = False -ATTR_ID = "id" ATTR_PSEUDO = "pseudo" ATTR_NAME = "name" ATTR_EVENT_TYPE = "event_type" diff --git a/homeassistant/components/netatmo/webhook.py b/homeassistant/components/netatmo/webhook.py index 582fce8985c..309451fd982 100644 --- a/homeassistant/components/netatmo/webhook.py +++ b/homeassistant/components/netatmo/webhook.py @@ -1,13 +1,13 @@ """The Netatmo integration.""" import logging +from homeassistant.const import ATTR_ID from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_send from .const import ( ATTR_EVENT_TYPE, ATTR_FACE_URL, - ATTR_ID, ATTR_IS_KNOWN, ATTR_NAME, ATTR_PERSONS, diff --git a/homeassistant/components/nightscout/const.py b/homeassistant/components/nightscout/const.py index 4bb96a94c29..7e47f7ff49d 100644 --- a/homeassistant/components/nightscout/const.py +++ b/homeassistant/components/nightscout/const.py @@ -3,6 +3,5 @@ DOMAIN = "nightscout" ATTR_DEVICE = "device" -ATTR_DATE = "date" ATTR_DELTA = "delta" ATTR_DIRECTION = "direction" diff --git a/homeassistant/components/nightscout/sensor.py b/homeassistant/components/nightscout/sensor.py index f4ff14d7b2a..efa625577d9 100644 --- a/homeassistant/components/nightscout/sensor.py +++ b/homeassistant/components/nightscout/sensor.py @@ -8,10 +8,11 @@ from aiohttp import ClientError from py_nightscout import Api as NightscoutAPI from homeassistant.config_entries import ConfigEntry +from homeassistant.const import ATTR_DATE from homeassistant.core import HomeAssistant from homeassistant.helpers.entity import Entity -from .const import ATTR_DATE, ATTR_DELTA, ATTR_DEVICE, ATTR_DIRECTION, DOMAIN +from .const import ATTR_DELTA, ATTR_DEVICE, ATTR_DIRECTION, DOMAIN SCAN_INTERVAL = timedelta(minutes=1) diff --git a/homeassistant/components/rachio/switch.py b/homeassistant/components/rachio/switch.py index 8009d79b224..44a17acaecf 100644 --- a/homeassistant/components/rachio/switch.py +++ b/homeassistant/components/rachio/switch.py @@ -6,7 +6,7 @@ import logging import voluptuous as vol from homeassistant.components.switch import SwitchEntity -from homeassistant.const import ATTR_ENTITY_ID +from homeassistant.const import ATTR_ENTITY_ID, ATTR_ID from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import config_validation as cv, entity_platform @@ -67,7 +67,6 @@ from .webhooks import ( _LOGGER = logging.getLogger(__name__) ATTR_DURATION = "duration" -ATTR_ID = "id" ATTR_PERCENT = "percent" ATTR_SCHEDULE_SUMMARY = "Summary" ATTR_SCHEDULE_ENABLED = "Enabled" diff --git a/homeassistant/components/reddit/sensor.py b/homeassistant/components/reddit/sensor.py index 0fe4e87f863..7a04fb6a8ae 100644 --- a/homeassistant/components/reddit/sensor.py +++ b/homeassistant/components/reddit/sensor.py @@ -7,6 +7,7 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( + ATTR_ID, CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_MAXIMUM, @@ -21,7 +22,6 @@ _LOGGER = logging.getLogger(__name__) CONF_SORT_BY = "sort_by" CONF_SUBREDDITS = "subreddits" -ATTR_ID = "id" ATTR_BODY = "body" ATTR_COMMENTS_NUMBER = "comms_num" ATTR_CREATED = "created" diff --git a/homeassistant/components/traccar/__init__.py b/homeassistant/components/traccar/__init__.py index c19a9cdd27e..cc598a9851b 100644 --- a/homeassistant/components/traccar/__init__.py +++ b/homeassistant/components/traccar/__init__.py @@ -3,7 +3,12 @@ from aiohttp import web import voluptuous as vol from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER -from homeassistant.const import CONF_WEBHOOK_ID, HTTP_OK, HTTP_UNPROCESSABLE_ENTITY +from homeassistant.const import ( + ATTR_ID, + CONF_WEBHOOK_ID, + HTTP_OK, + HTTP_UNPROCESSABLE_ENTITY, +) from homeassistant.helpers import config_entry_flow import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_send @@ -13,7 +18,6 @@ from .const import ( ATTR_ALTITUDE, ATTR_BATTERY, ATTR_BEARING, - ATTR_ID, ATTR_LATITUDE, ATTR_LONGITUDE, ATTR_SPEED, diff --git a/homeassistant/components/traccar/const.py b/homeassistant/components/traccar/const.py index 56c0ab5ba1d..06dd368b6a3 100644 --- a/homeassistant/components/traccar/const.py +++ b/homeassistant/components/traccar/const.py @@ -12,7 +12,6 @@ ATTR_BATTERY = "batt" ATTR_BEARING = "bearing" ATTR_CATEGORY = "category" ATTR_GEOFENCE = "geofence" -ATTR_ID = "id" ATTR_LATITUDE = "lat" ATTR_LONGITUDE = "lon" ATTR_MOTION = "motion" diff --git a/homeassistant/components/usgs_earthquakes_feed/geo_location.py b/homeassistant/components/usgs_earthquakes_feed/geo_location.py index 2b149fcac26..9fd98de42df 100644 --- a/homeassistant/components/usgs_earthquakes_feed/geo_location.py +++ b/homeassistant/components/usgs_earthquakes_feed/geo_location.py @@ -11,6 +11,7 @@ import voluptuous as vol from homeassistant.components.geo_location import PLATFORM_SCHEMA, GeolocationEvent from homeassistant.const import ( ATTR_ATTRIBUTION, + ATTR_TIME, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS, @@ -30,7 +31,6 @@ ATTR_EXTERNAL_ID = "external_id" ATTR_MAGNITUDE = "magnitude" ATTR_PLACE = "place" ATTR_STATUS = "status" -ATTR_TIME = "time" ATTR_TYPE = "type" ATTR_UPDATED = "updated" diff --git a/homeassistant/components/watson_tts/tts.py b/homeassistant/components/watson_tts/tts.py index 9b2af2ea7fe..ad989ec39fc 100644 --- a/homeassistant/components/watson_tts/tts.py +++ b/homeassistant/components/watson_tts/tts.py @@ -8,7 +8,6 @@ import homeassistant.helpers.config_validation as cv CONF_URL = "watson_url" CONF_APIKEY = "watson_apikey" -ATTR_CREDENTIALS = "credentials" DEFAULT_URL = "https://stream.watsonplatform.net/text-to-speech/api" diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py index 9c8c245e910..f6edb2f4596 100644 --- a/homeassistant/components/zwave_js/__init__.py +++ b/homeassistant/components/zwave_js/__init__.py @@ -12,7 +12,7 @@ from zwave_js_server.model.value import ValueNotification from homeassistant.components.hassio.handler import HassioAPIError from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_STOP +from homeassistant.const import ATTR_DOMAIN, CONF_URL, EVENT_HOMEASSISTANT_STOP from homeassistant.core import Event, HomeAssistant, callback from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers import device_registry @@ -24,7 +24,6 @@ from .const import ( ATTR_COMMAND_CLASS, ATTR_COMMAND_CLASS_NAME, ATTR_DEVICE_ID, - ATTR_DOMAIN, ATTR_ENDPOINT, ATTR_HOME_ID, ATTR_LABEL, diff --git a/homeassistant/components/zwave_js/const.py b/homeassistant/components/zwave_js/const.py index dc2ffaeaa20..9905eba0693 100644 --- a/homeassistant/components/zwave_js/const.py +++ b/homeassistant/components/zwave_js/const.py @@ -28,7 +28,6 @@ ATTR_VALUE = "value" ATTR_COMMAND_CLASS = "command_class" ATTR_COMMAND_CLASS_NAME = "command_class_name" ATTR_TYPE = "type" -ATTR_DOMAIN = "domain" ATTR_DEVICE_ID = "device_id" ATTR_PROPERTY_NAME = "property_name" ATTR_PROPERTY_KEY_NAME = "property_key_name" diff --git a/tests/components/dynalite/common.py b/tests/components/dynalite/common.py index 48ec378689e..072e222c194 100644 --- a/tests/components/dynalite/common.py +++ b/tests/components/dynalite/common.py @@ -2,11 +2,11 @@ from unittest.mock import AsyncMock, Mock, call, patch from homeassistant.components import dynalite +from homeassistant.const import ATTR_SERVICE from homeassistant.helpers import entity_registry from tests.common import MockConfigEntry -ATTR_SERVICE = "service" ATTR_METHOD = "method" ATTR_ARGS = "args" diff --git a/tests/components/nightscout/test_sensor.py b/tests/components/nightscout/test_sensor.py index 3df98a2595a..5e73c75d93c 100644 --- a/tests/components/nightscout/test_sensor.py +++ b/tests/components/nightscout/test_sensor.py @@ -1,12 +1,11 @@ """The sensor tests for the Nightscout platform.""" from homeassistant.components.nightscout.const import ( - ATTR_DATE, ATTR_DELTA, ATTR_DEVICE, ATTR_DIRECTION, ) -from homeassistant.const import ATTR_ICON, STATE_UNAVAILABLE +from homeassistant.const import ATTR_DATE, ATTR_ICON, STATE_UNAVAILABLE from tests.components.nightscout import ( GLUCOSE_READINGS,