jeena/home-assistant
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Removing asyncio.coroutine syntax from HASS core (#12509)

Browse source 
* changed asyncio.coroutine syntax to new async def/await

* removed py34 from tox environment

* reverted some changes within entity.py

* -

* reverted changes within bootstrap.py

* reverted changes within discovery.py

* switched decorators

* Reverted change within aiohttp_client.py

* reverted change within logging.py

* switched decorators

* Await lock properly

* removed asyncio.coroutine from test
This commit is contained in:
Julius Mittenzwei 2018-02-25 12:38:46 +01:00 • committed by Paulus Schoutsen
parent eacfbc048a
commit 16cb7388ee
20 changed files with 148 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

12
homeassistant/helpers/script.py
View file

@ -1,5 +1,5 @@
"""Helpers to execute scripts."""
import asyncio
import logging
from itertools import islice
from typing import Optional, Sequence
@ -68,8 +68,7 @@ class Script():
run_coroutine_threadsafe(
self.async_run(variables), self.hass.loop).result()
@asyncio.coroutine
def async_run(self, variables: Optional[Sequence] = None) -> None:
async def async_run(self, variables: Optional[Sequence] = None) -> None:
"""Run script.
This method is a coroutine.
@ -151,7 +150,7 @@ class Script():
self._async_fire_event(action, variables)
else:
yield from self._async_call_service(action, variables)
await self._async_call_service(action, variables)
self._cur = -1
self.last_action = None
@ -172,15 +171,14 @@ class Script():
if self._change_listener:
self.hass.async_add_job(self._change_listener)
@asyncio.coroutine
def _async_call_service(self, action, variables):
async def _async_call_service(self, action, variables):
"""Call the service specified in the action.
This method is a coroutine.
"""
self.last_action = action.get(CONF_ALIAS, 'call service')
self._log("Executing step %s" % self.last_action)
yield from service.async_call_from_config(
await service.async_call_from_config(
self.hass, action, True, variables, validate_config=False)
def _async_fire_event(self, action, variables):