Remove more deprecated method calls

homeassistant/components/automation/state.py

@@ -6,6 +6,7 @@ Offers state listening automation rules.
 """
 import logging
 
+from homeassistant.helpers.event import track_state_change
 from homeassistant.const import MATCH_ALL
 
 
@@ -30,7 +31,7 @@ def register(hass, config, action):
         """ Listens for state changes and calls action. """
         action()
 
-    hass.states.track_change(
-        entity_id, state_automation_listener, from_state, to_state)
+    track_state_change(
+        hass, entity_id, state_automation_listener, from_state, to_state)
 
     return True

homeassistant/components/device_sun_light_trigger.py

@@ -8,7 +8,7 @@ the state of the sun and devices.
 import logging
 from datetime import timedelta
 
-from homeassistant.helpers.event import track_point_in_time
+from homeassistant.helpers.event import track_point_in_time, track_state_change
 import homeassistant.util.dt as dt_util
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
 from . import light, sun, device_tracker, group
@@ -98,8 +98,8 @@ def setup(hass, config):
 
     # Track every time sun rises so we can schedule a time-based
     # pre-sun set event
-    hass.states.track_change(sun.ENTITY_ID, schedule_light_on_sun_rise,
-                             sun.STATE_BELOW_HORIZON, sun.STATE_ABOVE_HORIZON)
+    track_state_change(hass, sun.ENTITY_ID, schedule_light_on_sun_rise,
+                       sun.STATE_BELOW_HORIZON, sun.STATE_ABOVE_HORIZON)
 
     # If the sun is already above horizon
     # schedule the time-based pre-sun set event
@@ -158,13 +158,13 @@ def setup(hass, config):
             light.turn_off(hass, light_ids)
 
     # Track home coming of each device
-    hass.states.track_change(
-        device_entity_ids, check_light_on_dev_state_change,
+    track_state_change(
+        hass, device_entity_ids, check_light_on_dev_state_change,
         STATE_NOT_HOME, STATE_HOME)
 
     # Track when all devices are gone to shut down lights
-    hass.states.track_change(
-        device_group, check_light_on_dev_state_change,
+    track_state_change(
+        hass, device_group, check_light_on_dev_state_change,
         STATE_HOME, STATE_NOT_HOME)
 
     return True

homeassistant/components/group.py

@@ -7,6 +7,7 @@ Provides functionality to group devices that can be turned on or off.
 
 import homeassistant as ha
 from homeassistant.helpers import generate_entity_id
+from homeassistant.helpers.event import track_state_change
 from homeassistant.helpers.entity import Entity
 import homeassistant.util as util
 from homeassistant.const import (
@@ -162,8 +163,8 @@ class Group(Entity):
 
     def start(self):
         """ Starts the tracking. """
-        self.hass.states.track_change(
-            self.tracking, self._state_changed_listener)
+        track_state_change(
+            self.hass, self.tracking, self._state_changed_listener)
 
     def stop(self):
         """ Unregisters the group from Home Assistant. """

homeassistant/components/scene.py

@@ -19,6 +19,7 @@ import logging
 from collections import namedtuple
 
 from homeassistant import State
+from homeassistant.helpers.event import track_state_change
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.state import reproduce_state
@@ -104,8 +105,8 @@ class Scene(ToggleEntity):
         self.prev_states = None
         self.ignore_updates = False
 
-        self.hass.states.track_change(
-            self.entity_ids, self.entity_state_changed)
+        track_state_change(
+            self.hass, self.entity_ids, self.entity_state_changed)
 
         self.update()
 

homeassistant/components/simple_alarm.py

@@ -9,6 +9,7 @@ Provides a simple alarm feature:
 import logging
 
 import homeassistant.loader as loader
+from homeassistant.helpers.event import track_state_change
 from homeassistant.const import STATE_ON, STATE_OFF, STATE_HOME, STATE_NOT_HOME
 
 DOMAIN = "simple_alarm"
@@ -83,8 +84,8 @@ def setup(hass, config):
         if not device_tracker.is_on(hass):
             unknown_alarm()
 
-    hass.states.track_change(
-        light.ENTITY_ID_ALL_LIGHTS,
+    track_state_change(
+        hass, light.ENTITY_ID_ALL_LIGHTS,
         unknown_alarm_if_lights_on, STATE_OFF, STATE_ON)
 
     def ring_known_alarm(entity_id, old_state, new_state):
@@ -93,8 +94,8 @@ def setup(hass, config):
             known_alarm()
 
     # Track home coming of each device
-    hass.states.track_change(
-        hass.states.entity_ids(device_tracker.DOMAIN),
+    track_state_change(
+        hass, hass.states.entity_ids(device_tracker.DOMAIN),
         ring_known_alarm, STATE_NOT_HOME, STATE_HOME)
 
     return True

homeassistant/components/thermostat/heat_control.py

@@ -63,6 +63,7 @@ import datetime
 import homeassistant.components as core
 
 from homeassistant.components.thermostat import ThermostatDevice
+from homeassistant.helpers.event import track_state_change
 from homeassistant.const import TEMP_CELCIUS, STATE_ON, STATE_OFF
 
 TOL_TEMP = 0.3
@@ -105,12 +106,12 @@ class HeatControl(ThermostatDevice):
         self._away = False
         self._heater_manual_changed = True
 
-        hass.states.track_change(self.heater_entity_id,
-                                 self._heater_turned_on,
-                                 STATE_OFF, STATE_ON)
-        hass.states.track_change(self.heater_entity_id,
-                                 self._heater_turned_off,
-                                 STATE_ON, STATE_OFF)
+        track_state_change(hass, self.heater_entity_id,
+                           self._heater_turned_on,
+                           STATE_OFF, STATE_ON)
+        track_state_change(hass, self.heater_entity_id,
+                           self._heater_turned_off,
+                           STATE_ON, STATE_OFF)
 
     @property
     def name(self):