From d03dfd985bff83e726e52a7ba1934d7e2278aed3 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 12 Dec 2018 16:30:42 +0100 Subject: [PATCH] Review comments --- homeassistant/components/config/entity_registry.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/config/entity_registry.py b/homeassistant/components/config/entity_registry.py index 13a968dd101..71833a2e42d 100644 --- a/homeassistant/components/config/entity_registry.py +++ b/homeassistant/components/config/entity_registry.py @@ -1,7 +1,7 @@ """HTTP views to interact with the entity registry.""" import voluptuous as vol -from homeassistant.core import callback, split_entity_id +from homeassistant.core import callback from homeassistant.helpers.entity_registry import async_get_registry from homeassistant.components import websocket_api from homeassistant.components.websocket_api.const import ERR_NOT_FOUND @@ -106,10 +106,9 @@ async def websocket_update_entity(hass, connection, msg): if 'new_entity_id' in msg: changes['new_entity_id'] = msg['new_entity_id'] - if (msg['new_entity_id'] in hass.states.async_entity_ids( - split_entity_id(msg['new_entity_id'])[0])): + if hass.states.get(msg['new_entity_id']) is not None: connection.send_message(websocket_api.error_message( - msg['id'], ERR_NOT_FOUND, 'Entity is already registered')) + msg['id'], 'invalid_info', 'Entity is already registered')) return try: