bug fixes

homeassistant/components/ecobee.py

@@ -30,7 +30,6 @@ from homeassistant.loader import get_component
 from homeassistant import bootstrap
 from homeassistant.util import Throttle
 from homeassistant.const import (
-    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
     EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE, ATTR_DISCOVERED, CONF_API_KEY)
 from datetime import timedelta
 import logging
@@ -153,16 +152,4 @@ def setup(hass, config):
 
     setup_ecobee(hass, NETWORK.ecobee, config)
 
-    def stop_ecobee(event):
-        """ Stop Ecobee. """
-
-        pass
-
-    def start_ecobee(event):
-        """ Called when Home Assistant starts up. """
-
-        hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_ecobee)
-
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_ecobee)
-
     return True

homeassistant/components/sensor/ecobee.py

@@ -26,7 +26,7 @@ ecobee:
 
 """
 from homeassistant.helpers.entity import Entity
-from homeassistant.components.ecobee import NETWORK
+from homeassistant.components import ecobee
 from homeassistant.const import TEMP_FAHRENHEIT
 import logging
 
@@ -48,9 +48,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if discovery_info is None:
         return
     dev = list()
-    while NETWORK is None:
-        continue
-    for name, data in NETWORK.ecobee.sensors.items():
+    for name, data in ecobee.NETWORK.ecobee.sensors.items():
         if 'temp' in data:
             dev.append(EcobeeSensor(name, 'temperature'))
         if 'humidity' in data:
@@ -86,8 +84,8 @@ class EcobeeSensor(Entity):
         return self._unit_of_measurement
 
     def update(self):
-        NETWORK.update()
-        data = NETWORK.ecobee.sensors[self.sensor_name]
+        ecobee.NETWORK.update()
+        data = ecobee.NETWORK.ecobee.sensors[self.sensor_name]
         if self.type == 'temperature':
             self._state = data['temp']
         elif self.type == 'humidity':

homeassistant/components/thermostat/ecobee.py

@@ -28,7 +28,7 @@ ecobee:
 from homeassistant.components.thermostat import (ThermostatDevice, STATE_COOL,
                                                  STATE_IDLE, STATE_HEAT)
 from homeassistant.const import (TEMP_FAHRENHEIT, STATE_ON, STATE_OFF)
-from homeassistant.components.ecobee import NETWORK
+from homeassistant.components import ecobee
 import logging
 
 DEPENDENCIES = ['ecobee']
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     """ Setup Platform """
     if discovery_info is None:
         return
-    data = NETWORK
+    data = ecobee.NETWORK
     hold_temp = discovery_info['hold_temp']
     _LOGGER.info("Loading ecobee thermostat component with hold_temp set to "
                  + str(hold_temp))