From 392c058d34631eeffabaf48f6e80d16e7eb98ae4 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Mon, 28 Dec 2020 18:34:08 +0100 Subject: [PATCH] Ensure consistent spelling of "ID" (#44585) --- homeassistant/components/discord/notify.py | 2 +- homeassistant/components/supla/__init__.py | 4 ++-- homeassistant/components/systemmonitor/sensor.py | 2 +- homeassistant/components/tag/__init__.py | 4 ++-- homeassistant/components/tasmota/device_trigger.py | 2 +- homeassistant/components/wolflink/__init__.py | 2 +- homeassistant/components/zha/core/gateway.py | 2 +- homeassistant/core.py | 2 +- homeassistant/helpers/entity_platform.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/discord/notify.py b/homeassistant/components/discord/notify.py index 11f83d80179..b7fd193afad 100644 --- a/homeassistant/components/discord/notify.py +++ b/homeassistant/components/discord/notify.py @@ -78,7 +78,7 @@ class DiscordNotificationService(BaseNotificationService): ) or discord_bot.get_user(channelid) if channel is None: - _LOGGER.warning("Channel not found for id: %s", channelid) + _LOGGER.warning("Channel not found for ID: %s", channelid) continue # Must create new instances of File for each channel. files = None diff --git a/homeassistant/components/supla/__init__.py b/homeassistant/components/supla/__init__.py index 40313a41553..084811c8fa0 100644 --- a/homeassistant/components/supla/__init__.py +++ b/homeassistant/components/supla/__init__.py @@ -126,7 +126,7 @@ async def discover_devices(hass, hass_config): if channel_function == SUPLA_FUNCTION_NONE: _LOGGER.debug( - "Ignored function: %s, channel id: %s", + "Ignored function: %s, channel ID: %s", channel_function, channel["id"], ) @@ -136,7 +136,7 @@ async def discover_devices(hass, hass_config): if component_name is None: _LOGGER.warning( - "Unsupported function: %s, channel id: %s", + "Unsupported function: %s, channel ID: %s", channel_function, channel["id"], ) diff --git a/homeassistant/components/systemmonitor/sensor.py b/homeassistant/components/systemmonitor/sensor.py index 1aa6bcdea75..00f193f8663 100644 --- a/homeassistant/components/systemmonitor/sensor.py +++ b/homeassistant/components/systemmonitor/sensor.py @@ -268,7 +268,7 @@ class SystemMonitorSensor(Entity): return except psutil.NoSuchProcess as err: _LOGGER.warning( - "Failed to load process with id: %s, old name: %s", + "Failed to load process with ID: %s, old name: %s", err.pid, err.name, ) diff --git a/homeassistant/components/tag/__init__.py b/homeassistant/components/tag/__init__.py index 321dce9a296..6c385181aaa 100644 --- a/homeassistant/components/tag/__init__.py +++ b/homeassistant/components/tag/__init__.py @@ -41,8 +41,8 @@ class TagIDExistsError(HomeAssistantError): """Raised when an item is not found.""" def __init__(self, item_id: str): - """Initialize tag id exists error.""" - super().__init__(f"Tag with id: {item_id} already exists.") + """Initialize tag ID exists error.""" + super().__init__(f"Tag with ID {item_id} already exists.") self.item_id = item_id diff --git a/homeassistant/components/tasmota/device_trigger.py b/homeassistant/components/tasmota/device_trigger.py index f06d815e5c5..463b1c65a98 100644 --- a/homeassistant/components/tasmota/device_trigger.py +++ b/homeassistant/components/tasmota/device_trigger.py @@ -157,7 +157,7 @@ async def async_setup_trigger(hass, tasmota_trigger, config_entry, discovery_has discovery_id = tasmota_trigger.cfg.trigger_id remove_update_signal = None _LOGGER.debug( - "Discovered trigger with id: %s '%s'", discovery_id, tasmota_trigger.cfg + "Discovered trigger with ID: %s '%s'", discovery_id, tasmota_trigger.cfg ) async def discovery_update(trigger_config): diff --git a/homeassistant/components/wolflink/__init__.py b/homeassistant/components/wolflink/__init__.py index 1bfae6cb900..39cd7127402 100644 --- a/homeassistant/components/wolflink/__init__.py +++ b/homeassistant/components/wolflink/__init__.py @@ -38,7 +38,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): device_id = entry.data[DEVICE_ID] gateway_id = entry.data[DEVICE_GATEWAY] _LOGGER.debug( - "Setting up wolflink integration for device: %s (id: %s, gateway: %s)", + "Setting up wolflink integration for device: %s (ID: %s, gateway: %s)", device_name, device_id, gateway_id, diff --git a/homeassistant/components/zha/core/gateway.py b/homeassistant/components/zha/core/gateway.py index 812ac168d48..c57c7269723 100644 --- a/homeassistant/components/zha/core/gateway.py +++ b/homeassistant/components/zha/core/gateway.py @@ -634,7 +634,7 @@ class ZHAGateway: tasks = [] for member in members: _LOGGER.debug( - "Adding member with IEEE: %s and endpoint id: %s to group: %s:0x%04x", + "Adding member with IEEE: %s and endpoint ID: %s to group: %s:0x%04x", member.ieee, member.endpoint_id, name, diff --git a/homeassistant/core.py b/homeassistant/core.py index 01c4047af65..6b657f600d8 100644 --- a/homeassistant/core.py +++ b/homeassistant/core.py @@ -863,7 +863,7 @@ class State: if not valid_state(state): raise InvalidStateError( - f"Invalid state encountered for entity id: {entity_id}. " + f"Invalid state encountered for entity ID: {entity_id}. " "State max length is 255 characters." ) diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py index ddd1847f6a8..7b38c102253 100644 --- a/homeassistant/helpers/entity_platform.py +++ b/homeassistant/helpers/entity_platform.py @@ -464,7 +464,7 @@ class EntityPlatform: # Make sure it is valid in case an entity set the value themselves if not valid_entity_id(entity.entity_id): entity.add_to_platform_abort() - raise HomeAssistantError(f"Invalid entity id: {entity.entity_id}") + raise HomeAssistantError(f"Invalid entity ID: {entity.entity_id}") already_exists = entity.entity_id in self.entities restored = False