jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard for callbacks in service helper (#31339)

Browse Source
This commit is contained in:
Paulus Schoutsen 2020-01-31 00:32:43 -08:00 committed by GitHub
parent b22dfa119b
commit d405069406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/camera/__init__.py
View File

@ -400,19 +400,17 @@ class Camera(Entity):
"""Turn off camera."""
raise NotImplementedError()
@callback
def async_turn_off(self):
async def async_turn_off(self):
"""Turn off camera."""
return self.hass.async_add_job(self.turn_off)
await self.hass.async_add_job(self.turn_off)
def turn_on(self):
"""Turn off camera."""
raise NotImplementedError()
@callback
def async_turn_on(self):
async def async_turn_on(self):
"""Turn off camera."""
return self.hass.async_add_job(self.turn_on)
await self.hass.async_add_job(self.turn_on)
def enable_motion_detection(self):
"""Enable motion detection in the camera."""

8
homeassistant/helpers/service.py
View File

@ -370,9 +370,13 @@ async def _handle_service_platform_call(
entity.async_set_context(context)
if isinstance(func, str):
result = await hass.async_add_job(partial(getattr(entity, func), **data))
result = hass.async_add_job(partial(getattr(entity, func), **data))
else:
result = await hass.async_add_job(func, entity, data)
result = hass.async_add_job(func, entity, data)
# Guard because callback functions do not return a task when passed to async_add_job.
if result is not None:
result = await result
if asyncio.iscoroutine(result):
_LOGGER.error(