Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 21:06:19 +00:00
Code Activity

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

49
homeassistant/helpers/entity_platform.py
View File

@@ -51,9 +51,8 @@ class EntityPlatform(object):
self.parallel_updates = asyncio.Semaphore(
parallel_updates, loop=hass.loop)
@asyncio.coroutine
def async_setup(self, platform, platform_config, discovery_info=None,
tries=0):
async def async_setup(self, platform, platform_config, discovery_info=None,
tries=0):
"""Setup the platform."""
logger = self.logger
hass = self.hass
@@ -78,7 +77,7 @@ class EntityPlatform(object):
None, platform.setup_platform, hass, platform_config,
self._schedule_add_entities, discovery_info
)
yield from asyncio.wait_for(
await asyncio.wait_for(
asyncio.shield(task, loop=hass.loop),
SLOW_SETUP_MAX_WAIT, loop=hass.loop)
@@ -88,7 +87,7 @@ class EntityPlatform(object):
self._tasks.clear()
if pending:
yield from asyncio.wait(
await asyncio.wait(
pending, loop=self.hass.loop)
hass.config.components.add(full_name)
@@ -142,8 +141,7 @@ class EntityPlatform(object):
self.async_add_entities(list(new_entities), update_before_add),
self.hass.loop).result()
@asyncio.coroutine
def async_add_entities(self, new_entities, update_before_add=False):
async def async_add_entities(self, new_entities, update_before_add=False):
"""Add entities for a single platform async.
This method must be run in the event loop.
@@ -155,14 +153,14 @@ class EntityPlatform(object):
hass = self.hass
component_entities = set(hass.states.async_entity_ids(self.domain))
registry = yield from async_get_registry(hass)
registry = await async_get_registry(hass)
tasks = [
self._async_add_entity(entity, update_before_add,
component_entities, registry)
for entity in new_entities]
yield from asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks, loop=self.hass.loop)
self.async_entities_added_callback()
if self._async_unsub_polling is not None or \
@@ -174,9 +172,8 @@ class EntityPlatform(object):
self.hass, self._update_entity_states, self.scan_interval
)
@asyncio.coroutine
def _async_add_entity(self, entity, update_before_add, component_entities,
registry):
async def _async_add_entity(self, entity, update_before_add,
component_entities, registry):
"""Helper method to add an entity to the platform."""
if entity is None:
raise ValueError('Entity cannot be None')
@@ -188,7 +185,7 @@ class EntityPlatform(object):
# Update properties before we generate the entity_id
if update_before_add:
try:
yield from entity.async_device_update(warning=False)
await entity.async_device_update(warning=False)
except Exception: # pylint: disable=broad-except
self.logger.exception(
"%s: Error on device update!", self.platform_name)
@@ -258,12 +255,11 @@ class EntityPlatform(object):
component_entities.add(entity.entity_id)
if hasattr(entity, 'async_added_to_hass'):
yield from entity.async_added_to_hass()
await entity.async_added_to_hass()
yield from entity.async_update_ha_state()
await entity.async_update_ha_state()
@asyncio.coroutine
def async_reset(self):
async def async_reset(self):
"""Remove all entities and reset data.
This method must be run in the event loop.
@@ -274,16 +270,15 @@ class EntityPlatform(object):
tasks = [self._async_remove_entity(entity_id)
for entity_id in self.entities]
yield from asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks, loop=self.hass.loop)
if self._async_unsub_polling is not None:
self._async_unsub_polling()
self._async_unsub_polling = None
@asyncio.coroutine
def async_remove_entity(self, entity_id):
async def async_remove_entity(self, entity_id):
"""Remove entity id from platform."""
yield from self._async_remove_entity(entity_id)
await self._async_remove_entity(entity_id)
# Clean up polling job if no longer needed
if (self._async_unsub_polling is not None and
@@ -292,18 +287,16 @@ class EntityPlatform(object):
self._async_unsub_polling()
self._async_unsub_polling = None
@asyncio.coroutine
def _async_remove_entity(self, entity_id):
async def _async_remove_entity(self, entity_id):
"""Remove entity id from platform."""
entity = self.entities.pop(entity_id)
if hasattr(entity, 'async_will_remove_from_hass'):
yield from entity.async_will_remove_from_hass()
await entity.async_will_remove_from_hass()
self.hass.states.async_remove(entity_id)
@asyncio.coroutine
def _update_entity_states(self, now):
async def _update_entity_states(self, now):
"""Update the states of all the polling entities.
To protect from flooding the executor, we will update async entities
@@ -318,7 +311,7 @@ class EntityPlatform(object):
self.scan_interval)
return
with (yield from self._process_updates):
with (await self._process_updates):
tasks = []
for entity in self.entities.values():
if not entity.should_poll:
@@ -326,4 +319,4 @@ class EntityPlatform(object):
tasks.append(entity.async_update_ha_state(True))
if tasks:
yield from asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks, loop=self.hass.loop)