From 199fbc7a15275b8a449ab8fd737cdd6bef0a3fed Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sat, 25 Jun 2016 21:03:37 +0200
Subject: [PATCH] Revert "fix autodiscovery"

This reverts commit 86ccf26a1a41a73ecb5d4514d66f4aacce4bf349.
---
 homeassistant/components/binary_sensor/homematic.py | 2 --
 homeassistant/components/homematic.py               | 5 ++++-
 homeassistant/components/light/homematic.py         | 2 --
 homeassistant/components/rollershutter/homematic.py | 2 --
 homeassistant/components/sensor/homematic.py        | 2 --
 homeassistant/components/switch/homematic.py        | 2 --
 homeassistant/components/thermostat/homematic.py    | 2 --
 7 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/binary_sensor/homematic.py b/homeassistant/components/binary_sensor/homematic.py
index acbc2eafe69..d2005f99ba5 100644
--- a/homeassistant/components/binary_sensor/homematic.py
+++ b/homeassistant/components/binary_sensor/homematic.py
@@ -55,8 +55,6 @@ SUPPORT_HM_EVENT_AS_BINMOD = [
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
-    if discovery_info:
-        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMBinarySensor,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/homematic.py b/homeassistant/components/homematic.py
index 3bc23bbdb71..040a15a368e 100644
--- a/homeassistant/components/homematic.py
+++ b/homeassistant/components/homematic.py
@@ -21,6 +21,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STOP, \
     ATTR_SERVICE, \
     ATTR_DISCOVERED, \
     STATE_UNKNOWN
+from homeassistant.loader import get_component
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 import homeassistant.bootstrap
@@ -149,8 +150,10 @@ def system_callback_handler(hass, config, src, *args):
                 # When devices of this type are found
                 # they are setup in HA and an event is fired
                 if found_devices:
+                    component = get_component(component_name)
+
                     # HA discovery event
-                    discovery.load_platform(hass, component_name, DOMAIN, {
+                    discovery.load_platform(hass, component, DOMAIN, {
                         ATTR_DISCOVER_DEVICES: found_devices
                     }, config)
 
diff --git a/homeassistant/components/light/homematic.py b/homeassistant/components/light/homematic.py
index 6ccc2f636ba..94dabb0f00a 100644
--- a/homeassistant/components/light/homematic.py
+++ b/homeassistant/components/light/homematic.py
@@ -29,8 +29,6 @@ DEPENDENCIES = ['homematic']
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
-    if discovery_info:
-        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMLight,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/rollershutter/homematic.py b/homeassistant/components/rollershutter/homematic.py
index 55a86be0bf6..e0dd5e5469f 100644
--- a/homeassistant/components/rollershutter/homematic.py
+++ b/homeassistant/components/rollershutter/homematic.py
@@ -29,8 +29,6 @@ DEPENDENCIES = ['homematic']
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
-    if discovery_info:
-        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMRollershutter,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/sensor/homematic.py b/homeassistant/components/sensor/homematic.py
index c07faedbf5b..52ece78f59e 100644
--- a/homeassistant/components/sensor/homematic.py
+++ b/homeassistant/components/sensor/homematic.py
@@ -41,8 +41,6 @@ HM_UNIT_HA_CAST = {
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
-    if discovery_info:
-        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMSensor,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/switch/homematic.py b/homeassistant/components/switch/homematic.py
index ca639b95ecb..5a630f43022 100644
--- a/homeassistant/components/switch/homematic.py
+++ b/homeassistant/components/switch/homematic.py
@@ -28,8 +28,6 @@ DEPENDENCIES = ['homematic']
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
-    if discovery_info:
-        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMSwitch,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/thermostat/homematic.py b/homeassistant/components/thermostat/homematic.py
index d98b674c692..a1ed06bc4bd 100644
--- a/homeassistant/components/thermostat/homematic.py
+++ b/homeassistant/components/thermostat/homematic.py
@@ -28,8 +28,6 @@ _LOGGER = logging.getLogger(__name__)
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
-    if discovery_info:
-        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMThermostat,
                                                   config,
                                                   add_callback_devices)