diff --git a/homeassistant/components/binary_sensor/enocean.py b/homeassistant/components/binary_sensor/enocean.py
index 631ed0021e18d7c6511d84f3f33d4812c8b07a85..bd68a232f220b56051442b55c44a885d6d85b4c6 100644
--- a/homeassistant/components/binary_sensor/enocean.py
+++ b/homeassistant/components/binary_sensor/enocean.py
@@ -20,7 +20,7 @@ DEPENDENCIES = ['enocean']
DEFAULT_NAME = 'EnOcean binary sensor'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
- vol.Required(CONF_ID): cv.string,
+ vol.Required(CONF_ID): vol.All(cv.ensure_list, [vol.Coerce(int)]),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA,
})
diff --git a/homeassistant/components/emulated_hue/upnp.py b/homeassistant/components/emulated_hue/upnp.py
index f81a8c1b68dc8e084d3a6b946a92a21f4e2d4cd8..fd880c40e6eb65bc7298ebb6cd4d6ede2efce8ef 100644
--- a/homeassistant/components/emulated_hue/upnp.py
+++ b/homeassistant/components/emulated_hue/upnp.py
@@ -74,6 +74,7 @@ CACHE-CONTROL: max-age=60
EXT:
LOCATION: http://{0}:{1}/description.xml
SERVER: FreeRTOS/6.0.5, UPnP/1.0, IpBridge/0.1
+hue-bridgeid: 1234
ST: urn:schemas-upnp-org:device:basic:1
USN: uuid:Socket-1_0-221438K0100073::urn:schemas-upnp-org:device:basic:1
diff --git a/homeassistant/components/light/enocean.py b/homeassistant/components/light/enocean.py
index ce65d8cc0411aaf0e2940e7c5e2716089b2c3422..e24aca4902ddf17d2f08990b1431d0aa808e6eaf 100644
--- a/homeassistant/components/light/enocean.py
+++ b/homeassistant/components/light/enocean.py
@@ -26,8 +26,9 @@ DEPENDENCIES = ['enocean']
SUPPORT_ENOCEAN = SUPPORT_BRIGHTNESS
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
- vol.Required(CONF_ID): cv.string,
- vol.Required(CONF_SENDER_ID): cv.string,
+ vol.Optional(CONF_ID, default=[]): vol.All(cv.ensure_list,
+ [vol.Coerce(int)]),
+ vol.Required(CONF_SENDER_ID): vol.All(cv.ensure_list, [vol.Coerce(int)]),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
})
diff --git a/homeassistant/components/sensor/enocean.py b/homeassistant/components/sensor/enocean.py
index e998b5c9c46b90f5c8157f5bc0f9520eee9a4a28..009718dd720887efe9bd169bcc9792e0ce171231 100644
--- a/homeassistant/components/sensor/enocean.py
+++ b/homeassistant/components/sensor/enocean.py
@@ -20,7 +20,7 @@ DEFAULT_NAME = 'EnOcean sensor'
DEPENDENCIES = ['enocean']
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
- vol.Required(CONF_ID): cv.string,
+ vol.Required(CONF_ID): vol.All(cv.ensure_list, [vol.Coerce(int)]),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
})
diff --git a/homeassistant/components/switch/enocean.py b/homeassistant/components/switch/enocean.py
index 71bd180ad10d5d0ce4bbc8f6dbeb1dee5260b75e..ead5d789bbd8c50f38539006b1798155366716b1 100644
--- a/homeassistant/components/switch/enocean.py
+++ b/homeassistant/components/switch/enocean.py
@@ -20,7 +20,7 @@ DEFAULT_NAME = 'EnOcean Switch'
DEPENDENCIES = ['enocean']
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
- vol.Required(CONF_ID): cv.string,
+ vol.Required(CONF_ID): vol.All(cv.ensure_list, [vol.Coerce(int)]),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
})
diff --git a/homeassistant/components/switch/hook.py b/homeassistant/components/switch/hook.py
index eba64c6aeb1cd2d433a96fb9921df8f0071599ec..689ab675b5f5e3f47d58ca273070b81631cf05fb 100644
--- a/homeassistant/components/switch/hook.py
+++ b/homeassistant/components/switch/hook.py
@@ -50,7 +50,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
return False
finally:
if response is not None:
- yield from response.close()
+ yield from response.release()
try:
token = data['data']['token']
@@ -72,7 +72,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
return False
finally:
if response is not None:
- yield from response.close()
+ yield from response.release()
yield from async_add_devices(
HookSmartHome(
@@ -127,7 +127,7 @@ class HookSmartHome(SwitchDevice):
finally:
if response is not None:
- yield from response.close()
+ yield from response.release()
_LOGGER.debug("Got: %s", data)
return data['return_value'] == '1'
diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index 09f8699f5d1666967c93e3487af63cc20acf6d1f..70b35e002475a79f07fb439479307a58e3ed0f24 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -204,7 +204,6 @@ class ActiveConnection:
self.hass = hass
self.request = request
self.wsock = None
- self.socket_task = None
self.event_listeners = {}
def debug(self, message1, message2=''):
@@ -220,34 +219,6 @@ class ActiveConnection:
self.debug('Sending', message)
self.wsock.send_json(message, dumps=JSON_DUMP)
- @callback
- def _cancel_connection(self, event):
- """Cancel this connection."""
- self.socket_task.cancel()
-
- @asyncio.coroutine
- def _call_service_helper(self, msg):
- """Helper to call a service and fire complete message."""
- yield from self.hass.services.async_call(msg['domain'], msg['service'],
- msg['service_data'], True)
- try:
- self.send_message(result_message(msg['id']))
- except RuntimeError:
- # Socket has been closed.
- pass
-
- @callback
- def _forward_event(self, iden, event):
- """Helper to forward events to websocket."""
- if event.event_type == EVENT_TIME_CHANGED:
- return
-
- try:
- self.send_message(event_message(iden, event))
- except RuntimeError:
- # Socket has been closed.
- pass
-
@asyncio.coroutine
def handle(self):
"""Handle the websocket connection."""
@@ -255,9 +226,15 @@ class ActiveConnection:
yield from wsock.prepare(self.request)
# Set up to cancel this connection when Home Assistant shuts down
- self.socket_task = asyncio.Task.current_task(loop=self.hass.loop)
- self.hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP,
- self._cancel_connection)
+ socket_task = asyncio.Task.current_task(loop=self.hass.loop)
+
+ @callback
+ def cancel_connection(event):
+ """Cancel this connection."""
+ socket_task.cancel()
+
+ unsub_stop = self.hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP,
+ cancel_connection)
self.debug('Connected')
@@ -351,6 +328,8 @@ class ActiveConnection:
_LOGGER.exception(error)
finally:
+ unsub_stop()
+
for unsub in self.event_listeners.values():
unsub()
@@ -363,8 +342,20 @@ class ActiveConnection:
"""Handle subscribe events command."""
msg = SUBSCRIBE_EVENTS_MESSAGE_SCHEMA(msg)
+ @callback
+ def forward_events(event):
+ """Helper to forward events to websocket."""
+ if event.event_type == EVENT_TIME_CHANGED:
+ return
+
+ try:
+ self.send_message(event_message(msg['id'], event))
+ except RuntimeError:
+ # Socket has been closed.
+ pass
+
self.event_listeners[msg['id']] = self.hass.bus.async_listen(
- msg['event_type'], partial(self._forward_event, msg['id']))
+ msg['event_type'], forward_events)
self.send_message(result_message(msg['id']))
@@ -386,7 +377,18 @@ class ActiveConnection:
"""Handle call service command."""
msg = CALL_SERVICE_MESSAGE_SCHEMA(msg)
- self.hass.async_add_job(self._call_service_helper(msg))
+ @asyncio.coroutine
+ def call_service_helper(msg):
+ """Helper to call a service and fire complete message."""
+ yield from self.hass.services.async_call(
+ msg['domain'], msg['service'], msg['service_data'], True)
+ try:
+ self.send_message(result_message(msg['id']))
+ except RuntimeError:
+ # Socket has been closed.
+ pass
+
+ self.hass.async_add_job(call_service_helper(msg))
def handle_get_states(self, msg):
"""Handle get states command."""
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 88b3d4a0e40eeb9146b60be374309aaab60ffde6..cc84cda9768e1287c28e7735c43b0a2d42d91b14 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
"""Constants used by Home Assistant components."""
MAJOR_VERSION = 0
MINOR_VERSION = 34
-PATCH_VERSION = '2'
+PATCH_VERSION = '3'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 4, 2)