Fixes/zha ieee tail (#28160)

* Fix ZHA entity_id assignment. * Update tests.
home-assistant · Oct 24, 2019 · 969322e · 969322e
1 parent b1fcecd
commit 969322e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/homeassistant/components/zha/entity.py b/homeassistant/components/zha/entity.py
@@ -40,7 +40,7 @@ def __init__(self, unique_id, zha_device, channels, skip_entity_id=False, **kwar
         self._unique_id = unique_id
         if not skip_entity_id:
             ieee = zha_device.ieee
-            ieeetail = "".join(["%02x" % (o,) for o in ieee[-4:]])
+            ieeetail = "".join([f"{o:02x}" for o in ieee[:4]])
             self.entity_id = "{}.{}_{}_{}_{}{}".format(
                 self._domain,
                 slugify(zha_device.manufacturer),

diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py
@@ -168,7 +168,7 @@ def make_entity_id(domain, device, cluster, use_suffix=True):
     machine so that we can test state changes.
     """
     ieee = device.ieee
-    ieeetail = "".join(["%02x" % (o,) for o in ieee[-4:]])
+    ieeetail = "".join([f"{o:02x}" for o in ieee[:4]])
     entity_id = "{}.{}_{}_{}_{}{}".format(
         domain,
         slugify(device.manufacturer),