From 3275b28e2ac5f67ede53cb9c5e82c630aa8eeac4 Mon Sep 17 00:00:00 2001 From: Lenn <78048721+LennP@users.noreply.github.com> Date: Mon, 19 Feb 2024 00:04:57 +0100 Subject: [PATCH] Fix Motionblinds brand name consistency (#110222) --- homeassistant/components/motion_blinds/__init__.py | 2 +- homeassistant/components/motion_blinds/config_flow.py | 6 +++--- homeassistant/components/motion_blinds/const.py | 6 +++--- homeassistant/components/motion_blinds/coordinator.py | 2 +- homeassistant/components/motion_blinds/cover.py | 10 +++++----- homeassistant/components/motion_blinds/entity.py | 4 ++-- homeassistant/components/motion_blinds/gateway.py | 6 +++--- homeassistant/components/motion_blinds/manifest.json | 2 +- homeassistant/components/motion_blinds/sensor.py | 4 ++-- homeassistant/components/motion_blinds/services.yaml | 2 +- homeassistant/components/smart_blinds/manifest.json | 2 +- homeassistant/generated/integrations.json | 4 ++-- tests/components/motion_blinds/__init__.py | 2 +- tests/components/motion_blinds/test_config_flow.py | 6 +++--- tests/components/motion_blinds/test_gateway.py | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/homeassistant/components/motion_blinds/__init__.py b/homeassistant/components/motion_blinds/__init__.py index 45b1e42c8bb..a4868c0a210 100644 --- a/homeassistant/components/motion_blinds/__init__.py +++ b/homeassistant/components/motion_blinds/__init__.py @@ -56,7 +56,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.config_entries.async_update_entry(entry, data=data) _LOGGER.debug( ( - "Motion Blinds interface updated from %s to %s, " + "Motionblinds interface updated from %s to %s, " "this should only occur after a network change" ), multicast_interface, diff --git a/homeassistant/components/motion_blinds/config_flow.py b/homeassistant/components/motion_blinds/config_flow.py index d93e0091369..588d470bb6c 100644 --- a/homeassistant/components/motion_blinds/config_flow.py +++ b/homeassistant/components/motion_blinds/config_flow.py @@ -1,4 +1,4 @@ -"""Config flow to configure Motion Blinds using their WLAN API.""" +"""Config flow to configure Motionblinds using their WLAN API.""" from __future__ import annotations from typing import Any @@ -62,12 +62,12 @@ class OptionsFlowHandler(config_entries.OptionsFlow): class MotionBlindsFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): - """Handle a Motion Blinds config flow.""" + """Handle a Motionblinds config flow.""" VERSION = 1 def __init__(self) -> None: - """Initialize the Motion Blinds flow.""" + """Initialize the Motionblinds flow.""" self._host: str | None = None self._ips: list[str] = [] self._config_settings = None diff --git a/homeassistant/components/motion_blinds/const.py b/homeassistant/components/motion_blinds/const.py index 429259a91c1..4d9f8a7934d 100644 --- a/homeassistant/components/motion_blinds/const.py +++ b/homeassistant/components/motion_blinds/const.py @@ -1,9 +1,9 @@ -"""Constants for the Motion Blinds component.""" +"""Constants for the Motionblinds component.""" from homeassistant.const import Platform DOMAIN = "motion_blinds" -MANUFACTURER = "Motion Blinds, Coulisse B.V." -DEFAULT_GATEWAY_NAME = "Motion Blinds Gateway" +MANUFACTURER = "Motionblinds, Coulisse B.V." +DEFAULT_GATEWAY_NAME = "Motionblinds Gateway" PLATFORMS = [Platform.COVER, Platform.SENSOR] diff --git a/homeassistant/components/motion_blinds/coordinator.py b/homeassistant/components/motion_blinds/coordinator.py index 57d67165320..f0cb67a6261 100644 --- a/homeassistant/components/motion_blinds/coordinator.py +++ b/homeassistant/components/motion_blinds/coordinator.py @@ -1,4 +1,4 @@ -"""DataUpdateCoordinator for motion blinds integration.""" +"""DataUpdateCoordinator for Motionblinds integration.""" import asyncio from datetime import timedelta import logging diff --git a/homeassistant/components/motion_blinds/cover.py b/homeassistant/components/motion_blinds/cover.py index 9dde08af5f0..5ab6ec39cda 100644 --- a/homeassistant/components/motion_blinds/cover.py +++ b/homeassistant/components/motion_blinds/cover.py @@ -1,4 +1,4 @@ -"""Support for Motion Blinds using their WLAN API.""" +"""Support for Motionblinds using their WLAN API.""" from __future__ import annotations import logging @@ -86,7 +86,7 @@ async def async_setup_entry( config_entry: ConfigEntry, async_add_entities: AddEntitiesCallback, ) -> None: - """Set up the Motion Blind from a config entry.""" + """Set up the Motionblind from a config entry.""" entities = [] motion_gateway = hass.data[DOMAIN][config_entry.entry_id][KEY_GATEWAY] coordinator = hass.data[DOMAIN][config_entry.entry_id][KEY_COORDINATOR] @@ -169,7 +169,7 @@ async def async_setup_entry( class MotionPositionDevice(MotionCoordinatorEntity, CoverEntity): - """Representation of a Motion Blind Device.""" + """Representation of a Motionblinds Device.""" _attr_name = None _restore_tilt = False @@ -306,7 +306,7 @@ class MotionPositionDevice(MotionCoordinatorEntity, CoverEntity): class MotionTiltDevice(MotionPositionDevice): - """Representation of a Motion Blind Device.""" + """Representation of a Motionblinds Device.""" _restore_tilt = True @@ -352,7 +352,7 @@ class MotionTiltDevice(MotionPositionDevice): class MotionTiltOnlyDevice(MotionTiltDevice): - """Representation of a Motion Blind Device.""" + """Representation of a Motionblinds Device.""" _restore_tilt = False diff --git a/homeassistant/components/motion_blinds/entity.py b/homeassistant/components/motion_blinds/entity.py index 56eccb04eae..36c45c3afc2 100644 --- a/homeassistant/components/motion_blinds/entity.py +++ b/homeassistant/components/motion_blinds/entity.py @@ -1,4 +1,4 @@ -"""Support for Motion Blinds using their WLAN API.""" +"""Support for Motionblinds using their WLAN API.""" from __future__ import annotations from motionblinds import DEVICE_TYPES_GATEWAY, DEVICE_TYPES_WIFI, MotionGateway @@ -20,7 +20,7 @@ from .gateway import device_name class MotionCoordinatorEntity(CoordinatorEntity[DataUpdateCoordinatorMotionBlinds]): - """Representation of a Motion Blind entity.""" + """Representation of a Motionblind entity.""" _attr_has_entity_name = True diff --git a/homeassistant/components/motion_blinds/gateway.py b/homeassistant/components/motion_blinds/gateway.py index c0ddc9b4287..ff37b640127 100644 --- a/homeassistant/components/motion_blinds/gateway.py +++ b/homeassistant/components/motion_blinds/gateway.py @@ -100,7 +100,7 @@ class ConnectMotionGateway: interfaces = await self.async_get_interfaces() for interface in interfaces: _LOGGER.debug( - "Checking Motion Blinds interface '%s' with host %s", interface, host + "Checking Motionblinds interface '%s' with host %s", interface, host ) # initialize multicast listener check_multicast = AsyncMotionMulticast(interface=interface) @@ -126,7 +126,7 @@ class ConnectMotionGateway: if result: # successfully received multicast _LOGGER.debug( - "Success using Motion Blinds interface '%s' with host %s", + "Success using Motionblinds interface '%s' with host %s", interface, host, ) @@ -134,7 +134,7 @@ class ConnectMotionGateway: _LOGGER.error( ( - "Could not find working interface for Motion Blinds host %s, using" + "Could not find working interface for Motionblinds host %s, using" " interface '%s'" ), host, diff --git a/homeassistant/components/motion_blinds/manifest.json b/homeassistant/components/motion_blinds/manifest.json index 6f7b7dfae38..6ba0a36563c 100644 --- a/homeassistant/components/motion_blinds/manifest.json +++ b/homeassistant/components/motion_blinds/manifest.json @@ -1,6 +1,6 @@ { "domain": "motion_blinds", - "name": "Motion Blinds", + "name": "Motionblinds", "codeowners": ["@starkillerOG"], "config_flow": true, "dependencies": ["network"], diff --git a/homeassistant/components/motion_blinds/sensor.py b/homeassistant/components/motion_blinds/sensor.py index dddcb0e00fd..3a5164ca559 100644 --- a/homeassistant/components/motion_blinds/sensor.py +++ b/homeassistant/components/motion_blinds/sensor.py @@ -1,4 +1,4 @@ -"""Support for Motion Blinds sensors.""" +"""Support for Motionblinds sensors.""" from motionblinds import DEVICE_TYPES_WIFI from motionblinds.motion_blinds import DEVICE_TYPE_TDBU @@ -23,7 +23,7 @@ async def async_setup_entry( config_entry: ConfigEntry, async_add_entities: AddEntitiesCallback, ) -> None: - """Perform the setup for Motion Blinds.""" + """Perform the setup for Motionblinds.""" entities: list[SensorEntity] = [] motion_gateway = hass.data[DOMAIN][config_entry.entry_id][KEY_GATEWAY] coordinator = hass.data[DOMAIN][config_entry.entry_id][KEY_COORDINATOR] diff --git a/homeassistant/components/motion_blinds/services.yaml b/homeassistant/components/motion_blinds/services.yaml index 7b18979ed0e..ef6fe99b722 100644 --- a/homeassistant/components/motion_blinds/services.yaml +++ b/homeassistant/components/motion_blinds/services.yaml @@ -1,4 +1,4 @@ -# Describes the format for available motion blinds services +# Describes the format for available Motionblinds services set_absolute_position: target: diff --git a/homeassistant/components/smart_blinds/manifest.json b/homeassistant/components/smart_blinds/manifest.json index d0ddb30c5ee..b1734de4598 100644 --- a/homeassistant/components/smart_blinds/manifest.json +++ b/homeassistant/components/smart_blinds/manifest.json @@ -1,6 +1,6 @@ { "domain": "smart_blinds", - "name": "Smart Blinds", + "name": "Smartblinds", "integration_type": "virtual", "supported_by": "motion_blinds" } diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json index 81b3b3b8192..093fffa3986 100644 --- a/homeassistant/generated/integrations.json +++ b/homeassistant/generated/integrations.json @@ -3699,7 +3699,7 @@ "iot_class": "local_push" }, "motion_blinds": { - "name": "Motion Blinds", + "name": "Motionblinds", "integration_type": "hub", "config_flow": true, "iot_class": "local_push" @@ -5408,7 +5408,7 @@ "iot_class": "cloud_polling" }, "smart_blinds": { - "name": "Smart Blinds", + "name": "Smartblinds", "integration_type": "virtual", "supported_by": "motion_blinds" }, diff --git a/tests/components/motion_blinds/__init__.py b/tests/components/motion_blinds/__init__.py index 1c77ce16922..3a22a3bdd1e 100644 --- a/tests/components/motion_blinds/__init__.py +++ b/tests/components/motion_blinds/__init__.py @@ -1 +1 @@ -"""Tests for the Motion Blinds integration.""" +"""Tests for the Motionblinds integration.""" diff --git a/tests/components/motion_blinds/test_config_flow.py b/tests/components/motion_blinds/test_config_flow.py index 8532836ebc3..43051e88562 100644 --- a/tests/components/motion_blinds/test_config_flow.py +++ b/tests/components/motion_blinds/test_config_flow.py @@ -1,4 +1,4 @@ -"""Test the Motion Blinds config flow.""" +"""Test the Motionblinds config flow.""" import socket from unittest.mock import Mock, patch @@ -71,7 +71,7 @@ TEST_INTERFACES = [ @pytest.fixture(name="motion_blinds_connect", autouse=True) def motion_blinds_connect_fixture(mock_get_source_ip): - """Mock motion blinds connection and entry setup.""" + """Mock Motionblinds connection and entry setup.""" with patch( "homeassistant.components.motion_blinds.gateway.MotionGateway.GetDeviceList", return_value=True, @@ -363,7 +363,7 @@ async def test_dhcp_flow(hass: HomeAssistant) -> None: async def test_dhcp_flow_abort(hass: HomeAssistant) -> None: - """Test that DHCP discovery aborts if not Motion Blinds.""" + """Test that DHCP discovery aborts if not Motionblinds.""" dhcp_data = dhcp.DhcpServiceInfo( ip=TEST_HOST, hostname="MOTION_abcdef", diff --git a/tests/components/motion_blinds/test_gateway.py b/tests/components/motion_blinds/test_gateway.py index 87d8c91a8a6..4166f741c4a 100644 --- a/tests/components/motion_blinds/test_gateway.py +++ b/tests/components/motion_blinds/test_gateway.py @@ -1,4 +1,4 @@ -"""Test the Motion Blinds config flow.""" +"""Test the Motionblinds config flow.""" from unittest.mock import Mock from motionblinds import DEVICE_TYPES_WIFI, BlindType