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

fix multiple PR issues

Browse source
This commit is contained in:
Joseph Hughes 2016-01-14 14:17:28 -07:00
parent a39148dd38
commit 313cbda0aa
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
homeassistant/components/sensor/nest.py
View file

@ -31,6 +31,7 @@ SENSOR_TEMP_TYPES = ['temperature',
def setup_platform(hass, config, add_devices, discovery_info=None):
"Setup Nest Sensor from config file"
logger = logging.getLogger(__name__)
try:
for structure in nest.NEST.structures:
@ -39,14 +40,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
if variable in SENSOR_TYPES:
add_devices([NestSensor(structure, device, variable)])
elif variable in SENSOR_TEMP_TYPES:
add_devices([NestTempSensor(structure, device, variable)])
add_devices([NestTempSensor(structure,
device,
variable)])
else:
logger.error('Nest sensor type: "%s" does not exist', variable)
logger.error('Nest sensor type: "%s" does not exist',
variable)
except socket.error:
logger.error(
"Connection error logging into the nest web service."
)
class NestSensor(Entity):
""" Represents a Nest sensor. """
@ -58,18 +63,22 @@ class NestSensor(Entity):
@property
def name(self):
""" Returns the name of the nest, if any. """
location = self.device.where
name = self.device.name
if location is None:
return name + ' ' + self.variable
return "{} {}".format(name, self.variable)
else:
if name == '':
return location.capitalize() + ' ' + self.variable
return "{} {}".format(location.capitalize(), self.variable)
else:
return location.capitalize() + '(' + name + ')' + self.variable
return "{}({}){}".format(location.capitalize(),
name,
self.variable)
@property
def state(self):
""" Returns the state of the sensor. """
return getattr(self.device, self.variable)
@property