evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get entity name from entity.name (#4798)

Browse source 
Grabbing the ATTR_FRIENDLY_NAME directly produces an error. Instead
grab from entity.name.
This commit is contained in:
Keaton Taylor 2016-12-07 23:45:18 -06:00 • committed by Paulus Schoutsen
parent 8295fc8b4c
commit 194b268ae3
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/emulated_hue/hue_api.py
View file

@ -6,8 +6,8 @@ from aiohttp import web
from homeassistant import core from homeassistant import core
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, SERVICE_TURN_OFF, SERVICE_TURN_ON, ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_ON,
STATE_ON, STATE_OFF, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, STATE_OFF, HTTP_BAD_REQUEST, HTTP_NOT_FOUND,
) )
from homeassistant.components.light import ( from homeassistant.components.light import (
ATTR_BRIGHTNESS, ATTR_SUPPORTED_FEATURES, SUPPORT_BRIGHTNESS ATTR_BRIGHTNESS, ATTR_SUPPORTED_FEATURES, SUPPORT_BRIGHTNESS
@ -251,8 +251,7 @@ def entity_to_json(entity, is_on=None, brightness=None):
if brightness is None: if brightness is None:
brightness = 255 if is_on else 0 brightness = 255 if is_on else 0
name = entity.attributes.get( name = entity.attributes.get(ATTR_EMULATED_HUE_NAME, entity.name)
ATTR_EMULATED_HUE_NAME, entity.attributes[ATTR_FRIENDLY_NAME])
return { return {
'state': 'state':