From 2b907ee56e8eba05b8af46eab97c75ba3337b676 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 30 Nov 2024 14:47:40 -0600
Subject: [PATCH] Strip trailing spaces from HomeKit names (#131971)

---
 homeassistant/components/homekit/util.py     | 2 +-
 tests/components/homekit/test_accessories.py | 4 ++--
 tests/components/homekit/test_util.py        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/homekit/util.py b/homeassistant/components/homekit/util.py
index b255d4c79dd37..d540a88d6e67a 100644
--- a/homeassistant/components/homekit/util.py
+++ b/homeassistant/components/homekit/util.py
@@ -114,7 +114,7 @@
 
 NUMBERS_ONLY_RE = re.compile(r"[^\d.]+")
 VERSION_RE = re.compile(r"([0-9]+)(\.[0-9]+)?(\.[0-9]+)?")
-INVALID_END_CHARS = "-_"
+INVALID_END_CHARS = "-_ "
 MAX_VERSION_PART = 2**32 - 1
 
 
diff --git a/tests/components/homekit/test_accessories.py b/tests/components/homekit/test_accessories.py
index c37cac84b8ab5..00cf42bb91631 100644
--- a/tests/components/homekit/test_accessories.py
+++ b/tests/components/homekit/test_accessories.py
@@ -121,7 +121,7 @@ async def test_home_accessory(hass: HomeAssistant, hk_driver) -> None:
     serv = acc3.services[0]  # SERV_ACCESSORY_INFO
     assert (
         serv.get_characteristic(CHAR_NAME).value
-        == "Home Accessory that exceeds the maximum maximum maximum maximum "
+        == "Home Accessory that exceeds the maximum maximum maximum maximum"
     )
     assert (
         serv.get_characteristic(CHAR_MANUFACTURER).value
@@ -154,7 +154,7 @@ async def test_home_accessory(hass: HomeAssistant, hk_driver) -> None:
     serv = acc4.services[0]  # SERV_ACCESSORY_INFO
     assert (
         serv.get_characteristic(CHAR_NAME).value
-        == "Home Accessory that exceeds the maximum maximum maximum maximum "
+        == "Home Accessory that exceeds the maximum maximum maximum maximum"
     )
     assert (
         serv.get_characteristic(CHAR_MANUFACTURER).value
diff --git a/tests/components/homekit/test_util.py b/tests/components/homekit/test_util.py
index ebd260de05406..e544362acc062 100644
--- a/tests/components/homekit/test_util.py
+++ b/tests/components/homekit/test_util.py
@@ -268,6 +268,7 @@ def test_cleanup_name_for_homekit() -> None:
     """Ensure name sanitize works as expected."""
 
     assert cleanup_name_for_homekit("abc") == "abc"
+    assert cleanup_name_for_homekit("abc ") == "abc"
     assert cleanup_name_for_homekit("a b c") == "a b c"
     assert cleanup_name_for_homekit("ab_c") == "ab c"
     assert (