evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't pass in loop (#23984)

Browse source 
* Don't pass in loop

* Revert some changes

* Lint + Axis revert

* reinstate loop

* Fix a test

* Set loop

* Update camera.py

* Lint
This commit is contained in:
Paulus Schoutsen 2019-05-22 21:09:59 -07:00 • committed by GitHub
parent 9e96397e6a
commit f995ab9d54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
117 changed files with 179 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/alert/__init__.py
View file

@ -118,7 +118,7 @@ async def async_setup(hass, config):
tasks = [alert.async_update_ha_state() for alert in entities]
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
return True

4
homeassistant/components/alexa/auth.py
View file

@ -39,7 +39,7 @@ class Auth:
self._prefs = None
self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
self._get_token_lock = asyncio.Lock(loop=hass.loop)
self._get_token_lock = asyncio.Lock()
async def async_do_auth(self, accept_grant_code):
"""Do authentication with an AcceptGrant code."""
@ -97,7 +97,7 @@ class Auth:
try:
session = aiohttp_client.async_get_clientsession(self.hass)
with async_timeout.timeout(DEFAULT_TIMEOUT, loop=self.hass.loop):
with async_timeout.timeout(DEFAULT_TIMEOUT):
response = await session.post(LWA_TOKEN_URI,
headers=LWA_HEADERS,
data=lwa_params,

2
homeassistant/components/alexa/smart_home.py
View file

@ -1432,7 +1432,7 @@ async def async_send_changereport_message(hass, config, alexa_entity):
try:
session = aiohttp_client.async_get_clientsession(hass)
with async_timeout.timeout(DEFAULT_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(DEFAULT_TIMEOUT):
response = await session.post(config.endpoint,
headers=headers,
json=message_serialized,

2
homeassistant/components/android_ip_webcam/__init__.py
View file

@ -233,7 +233,7 @@ async def async_setup(hass, config):
tasks = [async_setup_ipcamera(conf) for conf in config[DOMAIN]]
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
return True

2
homeassistant/components/anthemav/media_player.py
View file

@ -47,7 +47,7 @@ async def async_setup_platform(hass, config, async_add_entities,
hass.async_create_task(device.async_update_ha_state())
avr = await anthemav.Connection.create(
host=host, port=port, loop=hass.loop,
host=host, port=port,
update_callback=async_anthemav_update_callback)
device = AnthemAVR(avr, name)

5
homeassistant/components/api/__init__.py
View file

@ -82,7 +82,7 @@ class APIEventStream(HomeAssistantView):
raise Unauthorized()
hass = request.app['hass']
stop_obj = object()
to_write = asyncio.Queue(loop=hass.loop)
to_write = asyncio.Queue()
restrict = request.query.get('restrict')
if restrict:
@ -119,8 +119,7 @@ class APIEventStream(HomeAssistantView):
while True:
try:
with async_timeout.timeout(STREAM_PING_INTERVAL,
loop=hass.loop):
with async_timeout.timeout(STREAM_PING_INTERVAL):
payload = await to_write.get()
if payload is stop_obj:

2
homeassistant/components/apple_tv/__init__.py
View file

@ -167,7 +167,7 @@ async def async_setup(hass, config):
tasks = [_setup_atv(hass, config, conf) for conf in config.get(DOMAIN, [])]
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
hass.services.async_register(
DOMAIN, SERVICE_SCAN, async_service_handler,

6
homeassistant/components/automation/__init__.py
View file

@ -124,7 +124,7 @@ async def async_setup(hass, config):
context=service_call.context))
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
async def turn_onoff_service_handler(service_call):
"""Handle automation turn on/off service calls."""
@ -134,7 +134,7 @@ async def async_setup(hass, config):
tasks.append(getattr(entity, method)())
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
async def toggle_service_handler(service_call):
"""Handle automation toggle service calls."""
@ -146,7 +146,7 @@ async def async_setup(hass, config):
tasks.append(entity.async_turn_on())
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
async def reload_service_handler(service_call):
"""Remove all automations and load new ones from config."""

4
homeassistant/components/aws/__init__.py
View file

@ -166,14 +166,14 @@ async def _validate_aws_credentials(hass, credential):
profile = aws_config.get(CONF_PROFILE_NAME)
if profile is not None:
session = aiobotocore.AioSession(profile=profile, loop=hass.loop)
session = aiobotocore.AioSession(profile=profile)
del aws_config[CONF_PROFILE_NAME]
if CONF_ACCESS_KEY_ID in aws_config:
del aws_config[CONF_ACCESS_KEY_ID]
if CONF_SECRET_ACCESS_KEY in aws_config:
del aws_config[CONF_SECRET_ACCESS_KEY]
else:
session = aiobotocore.AioSession(loop=hass.loop)
session = aiobotocore.AioSession()
if credential[CONF_VALIDATE]:
async with session.create_client("iam", **aws_config) as client:

4
homeassistant/components/aws/notify.py
View file

@ -94,10 +94,10 @@ async def async_get_service(hass, config, discovery_info=None):
if session is None:
profile = aws_config.get(CONF_PROFILE_NAME)
if profile is not None:
session = aiobotocore.AioSession(profile=profile, loop=hass.loop)
session = aiobotocore.AioSession(profile=profile)
del aws_config[CONF_PROFILE_NAME]
else:
session = aiobotocore.AioSession(loop=hass.loop)
session = aiobotocore.AioSession()
aws_config[CONF_REGION] = region_name

8
homeassistant/components/bluesound/media_player.py
View file

@ -255,7 +255,7 @@ class BluesoundPlayer(MediaPlayerDevice):
BluesoundPlayer._TimeoutException):
_LOGGER.info("Node %s is offline, retrying later", self._name)
await asyncio.sleep(
NODE_OFFLINE_CHECK_TIMEOUT, loop=self._hass.loop)
NODE_OFFLINE_CHECK_TIMEOUT)
self.start_polling()
except CancelledError:
@ -318,7 +318,7 @@ class BluesoundPlayer(MediaPlayerDevice):
try:
websession = async_get_clientsession(self._hass)
with async_timeout.timeout(10, loop=self._hass.loop):
with async_timeout.timeout(10):
response = await websession.get(url)
if response.status == 200:
@ -361,7 +361,7 @@ class BluesoundPlayer(MediaPlayerDevice):
try:
with async_timeout.timeout(125, loop=self._hass.loop):
with async_timeout.timeout(125):
response = await self._polling_session.get(
url, headers={CONNECTION: KEEP_ALIVE})
@ -378,7 +378,7 @@ class BluesoundPlayer(MediaPlayerDevice):
self._group_name = group_name
# the sleep is needed to make sure that the
# devices is synced
await asyncio.sleep(1, loop=self._hass.loop)
await asyncio.sleep(1)
await self.async_trigger_sync_on_all()
elif self.is_grouped:
# when player is grouped we need to fetch volume from

4
homeassistant/components/buienradar/sensor.py
View file

@ -388,7 +388,7 @@ class BrData:
tasks.append(dev.async_update_ha_state())
if tasks:
await asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks)
async def schedule_update(self, minute=1):
"""Schedule an update after minute minutes."""
@ -407,7 +407,7 @@ class BrData:
resp = None
try:
websession = async_get_clientsession(self.hass)
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
resp = await websession.get(url)
result[STATUS_CODE] = resp.status

4
homeassistant/components/camera/__init__.py
View file

@ -121,7 +121,7 @@ async def async_get_image(hass, entity_id, timeout=10):
camera = _get_camera_from_entity_id(hass, entity_id)
with suppress(asyncio.CancelledError, asyncio.TimeoutError):
with async_timeout.timeout(timeout, loop=hass.loop):
with async_timeout.timeout(timeout):
image = await camera.async_camera_image()
if image:
@ -481,7 +481,7 @@ class CameraImageView(CameraView):
async def handle(self, request, camera):
"""Serve camera image."""
with suppress(asyncio.CancelledError, asyncio.TimeoutError):
with async_timeout.timeout(10, loop=request.app['hass'].loop):
with async_timeout.timeout(10):
image = await camera.async_camera_image()
if image:

2
homeassistant/components/canary/camera.py
View file

@ -79,7 +79,7 @@ class CanaryCamera(Camera):
image = await asyncio.shield(ffmpeg.get_image(
self._live_stream_session.live_stream_url,
output_format=IMAGE_JPEG,
extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
extra_cmd=self._ffmpeg_arguments))
return image
async def handle_async_mjpeg_stream(self, request):

6
homeassistant/components/citybikes/sensor.py
View file

@ -106,7 +106,7 @@ async def async_citybikes_request(hass, uri, schema):
try:
session = async_get_clientsession(hass)
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
req = await session.get(DEFAULT_ENDPOINT.format(uri=uri))
json_response = await req.json()
@ -181,7 +181,7 @@ class CityBikesNetworks:
"""Initialize the networks instance."""
self.hass = hass
self.networks = None
self.networks_loading = asyncio.Condition(loop=hass.loop)
self.networks_loading = asyncio.Condition()
async def get_closest_network_id(self, latitude, longitude):
"""Return the id of the network closest to provided location."""
@ -217,7 +217,7 @@ class CityBikesNetwork:
self.hass = hass
self.network_id = network_id
self.stations = []
self.ready = asyncio.Event(loop=hass.loop)
self.ready = asyncio.Event()
async def async_refresh(self, now=None):
"""Refresh the state of the network."""

16
homeassistant/components/cloud/http_api.py
View file

@ -164,10 +164,10 @@ class GoogleActionsSyncView(HomeAssistantView):
cloud = hass.data[DOMAIN]
websession = hass.helpers.aiohttp_client.async_get_clientsession()
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
await hass.async_add_job(cloud.auth.check_token)
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
req = await websession.post(
cloud.google_actions_sync_url, headers={
'authorization': cloud.id_token
@ -192,7 +192,7 @@ class CloudLoginView(HomeAssistantView):
hass = request.app['hass']
cloud = hass.data[DOMAIN]
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
await hass.async_add_job(cloud.auth.login, data['email'],
data['password'])
@ -212,7 +212,7 @@ class CloudLogoutView(HomeAssistantView):
hass = request.app['hass']
cloud = hass.data[DOMAIN]
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
await cloud.logout()
return self.json_message('ok')
@ -234,7 +234,7 @@ class CloudRegisterView(HomeAssistantView):
hass = request.app['hass']
cloud = hass.data[DOMAIN]
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
await hass.async_add_job(
cloud.auth.register, data['email'], data['password'])
@ -256,7 +256,7 @@ class CloudResendConfirmView(HomeAssistantView):
hass = request.app['hass']
cloud = hass.data[DOMAIN]
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
await hass.async_add_job(
cloud.auth.resend_email_confirm, data['email'])
@ -278,7 +278,7 @@ class CloudForgotPasswordView(HomeAssistantView):
hass = request.app['hass']
cloud = hass.data[DOMAIN]
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
await hass.async_add_job(
cloud.auth.forgot_password, data['email'])
@ -320,7 +320,7 @@ async def websocket_subscription(hass, connection, msg):
from hass_nabucasa.const import STATE_DISCONNECTED
cloud = hass.data[DOMAIN]
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
response = await cloud.fetch_subscription_info()
if response.status != 200:

2
homeassistant/components/comed_hourly_pricing/sensor.py
View file

@ -106,7 +106,7 @@ class ComedHourlyPricingSensor(Entity):
else:
url_string += '?type=currenthouraverage'
with async_timeout.timeout(60, loop=self.loop):
with async_timeout.timeout(60):
response = await self.websession.get(url_string)
# The API responds with MIME type 'text/html'
text = await response.text()

2
homeassistant/components/config/__init__.py
View file

@ -62,7 +62,7 @@ async def async_setup(hass, config):
tasks.append(setup_panel(panel_name))
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
return True

2
homeassistant/components/device_tracker/__init__.py
View file

@ -144,7 +144,7 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType):
}))
if setup_tasks:
await asyncio.wait(setup_tasks, loop=hass.loop)
await asyncio.wait(setup_tasks)
tracker.async_setup_group()

4
homeassistant/components/device_tracker/legacy.py
View file

@ -82,7 +82,7 @@ class DeviceTracker:
else defaults.get(CONF_TRACK_NEW, DEFAULT_TRACK_NEW)
self.defaults = defaults
self.group = None
self._is_updating = asyncio.Lock(loop=hass.loop)
self._is_updating = asyncio.Lock()
for dev in devices:
if self.devices[dev.dev_id] is not dev:
@ -229,7 +229,7 @@ class DeviceTracker:
async_init_single_device(device)))
if tasks:
await asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks)
class Device(RestoreEntity):

2
homeassistant/components/device_tracker/setup.py
View file

@ -147,7 +147,7 @@ def async_setup_scanner_platform(hass: HomeAssistantType, config: ConfigType,
This method must be run in the event loop.
"""
interval = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
update_lock = asyncio.Lock(loop=hass.loop)
update_lock = asyncio.Lock()
scanner.hass = hass
# Initial scan of each mac we also tell about host name for config

2
homeassistant/components/discord/notify.py
View file

@ -46,7 +46,7 @@ class DiscordNotificationService(BaseNotificationService):
import discord
discord.VoiceClient.warn_nacl = False
discord_bot = discord.Client(loop=self.hass.loop)
discord_bot = discord.Client()
images = None
if ATTR_TARGET not in kwargs:

1
homeassistant/components/dlna_dmr/media_player.py
View file

@ -103,7 +103,6 @@ async def async_start_event_handler(
requester,
listen_port=server_port,
listen_host=server_host,
loop=hass.loop,
callback_url=callback_url_override)
await server.start_server()
_LOGGER.info(

2
homeassistant/components/dnsip/sensor.py
View file

@ -63,7 +63,7 @@ class WanIpSensor(Entity):
self.hass = hass
self._name = name
self.hostname = hostname
self.resolver = aiodns.DNSResolver(loop=self.hass.loop)
self.resolver = aiodns.DNSResolver()
self.resolver.nameservers = [resolver]
self.querytype = 'AAAA' if ipv6 else 'A'
self._state = None

2
homeassistant/components/doorbird/camera.py
View file

@ -81,7 +81,7 @@ class DoorBirdCamera(Camera):
try:
websession = async_get_clientsession(self.hass)
with async_timeout.timeout(_TIMEOUT, loop=self.hass.loop):
with async_timeout.timeout(_TIMEOUT):
response = await websession.get(self._url)
self._last_image = await response.read()

8
homeassistant/components/dsmr/sensor.py
View file

@ -183,12 +183,11 @@ async def async_setup_platform(hass, config, async_add_entities,
if CONF_HOST in config:
reader_factory = partial(
create_tcp_dsmr_reader, config[CONF_HOST], config[CONF_PORT],
config[CONF_DSMR_VERSION], update_entities_telegram,
loop=hass.loop)
config[CONF_DSMR_VERSION], update_entities_telegram)
else:
reader_factory = partial(
create_dsmr_reader, config[CONF_PORT], config[CONF_DSMR_VERSION],
update_entities_telegram, loop=hass.loop)
update_entities_telegram)
async def connect_and_reconnect():
"""Connect to DSMR and keep reconnecting until Home Assistant stops."""
@ -223,8 +222,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_entities_telegram({})
# throttle reconnect attempts
await asyncio.sleep(config[CONF_RECONNECT_INTERVAL],
loop=hass.loop)
await asyncio.sleep(config[CONF_RECONNECT_INTERVAL])
# Can't be hass.async_add_job because job runs forever
hass.loop.create_task(connect_and_reconnect())

2
homeassistant/components/envisalink/__init__.py
View file

@ -106,7 +106,7 @@ async def async_setup(hass, config):
zones = conf.get(CONF_ZONES)
partitions = conf.get(CONF_PARTITIONS)
connection_timeout = conf.get(CONF_TIMEOUT)
sync_connect = asyncio.Future(loop=hass.loop)
sync_connect = asyncio.Future()
controller = EnvisalinkAlarmPanel(
host, port, panel_type, version, user, password, zone_dump,

2
homeassistant/components/ffmpeg/camera.py
View file

@ -59,7 +59,7 @@ class FFmpegCamera(Camera):
image = await asyncio.shield(ffmpeg.get_image(
self._input, output_format=IMAGE_JPEG,
extra_cmd=self._extra_arguments), loop=self.hass.loop)
extra_cmd=self._extra_arguments))
return image
async def handle_async_mjpeg_stream(self, request):

7
homeassistant/components/flock/notify.py
View file

@ -26,15 +26,14 @@ async def get_service(hass, config, discovery_info=None):
url = '{}{}'.format(_RESOURCE, access_token)
session = async_get_clientsession(hass)
return FlockNotificationService(url, session, hass.loop)
return FlockNotificationService(url, session)
class FlockNotificationService(BaseNotificationService):
"""Implement the notification service for Flock."""
def __init__(self, url, session, loop):
def __init__(self, url, session):
"""Initialize the Flock notification service."""
self._loop = loop
self._url = url
self._session = session
@ -45,7 +44,7 @@ class FlockNotificationService(BaseNotificationService):
_LOGGER.debug("Attempting to call Flock at %s", self._url)
try:
with async_timeout.timeout(10, loop=self._loop):
with async_timeout.timeout(10):
response = await self._session.post(self._url, json=payload)
result = await response.json()

2
homeassistant/components/freedns/__init__.py
View file

@ -68,7 +68,7 @@ async def _update_freedns(hass, session, url, auth_token):
params[auth_token] = ""
try:
with async_timeout.timeout(TIMEOUT, loop=hass.loop):
with async_timeout.timeout(TIMEOUT):
resp = await session.get(url, params=params)
body = await resp.text()

4
homeassistant/components/frontend/__init__.py
View file

@ -243,11 +243,11 @@ async def async_setup(hass, config):
await asyncio.wait(
[async_register_built_in_panel(hass, panel) for panel in (
'kiosk', 'states', 'profile')], loop=hass.loop)
'kiosk', 'states', 'profile')])
await asyncio.wait(
[async_register_built_in_panel(hass, panel, require_admin=True)
for panel in ('dev-event', 'dev-info', 'dev-service', 'dev-state',
'dev-template', 'dev-mqtt')], loop=hass.loop)
'dev-template', 'dev-mqtt')])
hass.data[DATA_FINALIZE_PANEL] = async_finalize_panel

2
homeassistant/components/generic/camera.py
View file

@ -127,7 +127,7 @@ class GenericCamera(Camera):
try:
websession = async_get_clientsession(
self.hass, verify_ssl=self.verify_ssl)
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
response = await websession.get(
url, auth=self._auth)
self._last_image = await response.read()

2
homeassistant/components/google_assistant/__init__.py
View file

@ -65,7 +65,7 @@ async def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
"""Handle request sync service calls."""
websession = async_get_clientsession(hass)
try:
with async_timeout.timeout(15, loop=hass.loop):
with async_timeout.timeout(15):
agent_user_id = call.data.get('agent_user_id') or \
call.context.user_id
res = await websession.post(

2
homeassistant/components/google_domains/__init__.py
View file

@ -67,7 +67,7 @@ async def _update_google_domains(
}
try:
with async_timeout.timeout(timeout, loop=hass.loop):
with async_timeout.timeout(timeout):
resp = await session.get(url, params=params)
body = await resp.text()

2
homeassistant/components/google_translate/tts.py
View file

@ -87,7 +87,7 @@ class GoogleProvider(Provider):
}
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
request = await websession.get(
GOOGLE_SPEECH_URL, params=url_param,
headers=self.headers

2
homeassistant/components/group/__init__.py
View file

@ -306,7 +306,7 @@ async def async_setup(hass, config):
tasks.append(group.async_update_ha_state())
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
hass.services.async_register(
DOMAIN, SERVICE_SET_VISIBILITY, visibility_service_handler,

2
homeassistant/components/group/notify.py
View file

@ -65,4 +65,4 @@ class GroupNotifyPlatform(BaseNotificationService):
DOMAIN, entity.get(ATTR_SERVICE), sending_payload))
if tasks:
await asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks)

2
homeassistant/components/hassio/handler.py
View file

@ -156,7 +156,7 @@ class HassIO:
This method is a coroutine.
"""
try:
with async_timeout.timeout(timeout, loop=self.loop):
with async_timeout.timeout(timeout):
request = await self.websession.request(
method, "http://{}{}".format(self._ip, command),
json=payload, headers={

4
homeassistant/components/hassio/http.py
View file

@ -71,13 +71,11 @@ class HassIOView(HomeAssistantView):
This method is a coroutine.
"""
read_timeout = _get_timeout(path)
hass = request.app['hass']
data = None
headers = _init_header(request)
try:
with async_timeout.timeout(10, loop=hass.loop):
with async_timeout.timeout(10):
data = await request.read()
method = getattr(self._websession, request.method.lower())

2
homeassistant/components/homeassistant/__init__.py
View file

@ -64,7 +64,7 @@ async def async_setup(hass: ha.HomeAssistant, config: dict) -> Awaitable[bool]:
tasks.append(hass.services.async_call(
domain, service.service, data, blocking))
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
hass.services.async_register(
ha.DOMAIN, SERVICE_TURN_OFF, async_handle_turn_service)

2
homeassistant/components/homekit_controller/connection.py
View file

@ -79,7 +79,7 @@ class HKDevice():
# There are multiple entities sharing a single connection - only
# allow one entity to use pairing at once.
self.pairing_lock = asyncio.Lock(loop=hass.loop)
self.pairing_lock = asyncio.Lock()
async def async_setup(self):
"""Prepare to use a paired HomeKit device in homeassistant."""

2
homeassistant/components/homematicip_cloud/hap.py
View file

@ -180,7 +180,7 @@ class HomematicipHAP:
try:
self._retry_task = self.hass.async_create_task(asyncio.sleep(
retry_delay, loop=self.hass.loop))
retry_delay))
await self._retry_task
except asyncio.CancelledError:
break

6
homeassistant/components/hook/switch.py
View file

@ -36,7 +36,7 @@ async def async_setup_platform(hass, config, async_add_entities,
# If password is set in config, prefer it over token
if username is not None and password is not None:
try:
with async_timeout.timeout(TIMEOUT, loop=hass.loop):
with async_timeout.timeout(TIMEOUT):
response = await websession.post(
'{}{}'.format(HOOK_ENDPOINT, 'user/login'),
data={
@ -56,7 +56,7 @@ async def async_setup_platform(hass, config, async_add_entities,
return False
try:
with async_timeout.timeout(TIMEOUT, loop=hass.loop):
with async_timeout.timeout(TIMEOUT):
response = await websession.get(
'{}{}'.format(HOOK_ENDPOINT, 'device'),
params={"token": token})
@ -103,7 +103,7 @@ class HookSmartHome(SwitchDevice):
try:
_LOGGER.debug("Sending: %s", url)
websession = async_get_clientsession(self.hass)
with async_timeout.timeout(TIMEOUT, loop=self.hass.loop):
with async_timeout.timeout(TIMEOUT):
response = await websession.get(
url, params={"token": self._token})
data = await response.json(content_type=None)

2
homeassistant/components/image_processing/__init__.py
View file

@ -77,7 +77,7 @@ async def async_setup(hass, config):
entity.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
hass.services.async_register(
DOMAIN, SERVICE_SCAN, async_scan_service,

4
homeassistant/components/ipma/weather.py
View file

@ -82,7 +82,7 @@ async def async_get_station(hass, latitude, longitude):
from pyipma import Station
websession = async_get_clientsession(hass)
with async_timeout.timeout(10, loop=hass.loop):
with async_timeout.timeout(10):
station = await Station.get(websession, float(latitude),
float(longitude))
@ -106,7 +106,7 @@ class IPMAWeather(WeatherEntity):
@Throttle(MIN_TIME_BETWEEN_UPDATES)
async def async_update(self):
"""Update Condition and Forecast."""
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
_new_condition = await self._station.observation()
if _new_condition is None:
_LOGGER.warning("Could not update weather conditions")

2
homeassistant/components/kodi/media_player.py
View file

@ -231,7 +231,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(update_coro)
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
if hass.services.has_service(DOMAIN, SERVICE_ADD_MEDIA):
return

4
homeassistant/components/lifx/light.py
View file

@ -202,7 +202,7 @@ class LIFXManager:
self.entities = {}
self.hass = hass
self.async_add_entities = async_add_entities
self.effects_conductor = aiolifx_effects().Conductor(loop=hass.loop)
self.effects_conductor = aiolifx_effects().Conductor(hass.loop)
self.discoveries = []
self.cleanup_unsub = self.hass.bus.async_listen(
EVENT_HOMEASSISTANT_STOP,
@ -253,7 +253,7 @@ class LIFXManager:
task = light.set_state(**service.data)
tasks.append(self.hass.async_create_task(task))
if tasks:
await asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks)
self.hass.services.async_register(
DOMAIN, SERVICE_LIFX_SET_STATE, service_handler,

4
homeassistant/components/lifx_cloud/scene.py
View file

@ -38,7 +38,7 @@ async def async_setup_platform(hass, config, async_add_entities,
try:
httpsession = async_get_clientsession(hass)
with async_timeout.timeout(timeout, loop=hass.loop):
with async_timeout.timeout(timeout):
scenes_resp = await httpsession.get(url, headers=headers)
except (asyncio.TimeoutError, aiohttp.ClientError):
@ -83,7 +83,7 @@ class LifxCloudScene(Scene):
try:
httpsession = async_get_clientsession(self.hass)
with async_timeout.timeout(self._timeout, loop=self.hass.loop):
with async_timeout.timeout(self._timeout):
await httpsession.put(url, headers=self._headers)
except (asyncio.TimeoutError, aiohttp.ClientError):

2
homeassistant/components/light/__init__.py
View file

@ -303,7 +303,7 @@ async def async_setup(hass, config):
light.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
# Listen for light on and light off service calls.
hass.services.async_register(

2
homeassistant/components/logi_circle/__init__.py
View file

@ -118,7 +118,7 @@ async def async_setup_entry(hass, entry):
return False
try:
with async_timeout.timeout(_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(_TIMEOUT):
# Ensure the cameras property returns the same Camera objects for
# all devices. Performs implicit login and session validation.
await logi_circle.synchronize_cameras()

2
homeassistant/components/logi_circle/config_flow.py
View file

@ -160,7 +160,7 @@ class LogiCircleFlowHandler(config_entries.ConfigFlow):
cache_file=DEFAULT_CACHEDB)
try:
with async_timeout.timeout(_TIMEOUT, loop=self.hass.loop):
with async_timeout.timeout(_TIMEOUT):
await logi_session.authorize(code)
except AuthorizationFailed:
(self.hass.data[DATA_FLOW_IMPL][DOMAIN]

5
homeassistant/components/mailbox/__init__.py
View file

@ -82,7 +82,7 @@ async def async_setup(hass, config):
in config_per_platform(config, DOMAIN)]
if setup_tasks:
await asyncio.wait(setup_tasks, loop=hass.loop)
await asyncio.wait(setup_tasks)
async def async_platform_discovered(platform, info):
"""Handle for discovered platform."""
@ -241,9 +241,8 @@ class MailboxMediaView(MailboxView):
"""Retrieve media."""
mailbox = self.get_mailbox(platform)
hass = request.app['hass']
with suppress(asyncio.CancelledError, asyncio.TimeoutError):
with async_timeout.timeout(10, loop=hass.loop):
with async_timeout.timeout(10):
try:
stream = await mailbox.async_get_media(msgid)
except StreamError as err:

2
homeassistant/components/marytts/tts.py
View file

@ -75,7 +75,7 @@ class MaryTTSProvider(Provider):
actual_language = re.sub('-', '_', language)
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
url = 'http://{}:{}/process?'.format(self._host, self._port)
audio = self._codec.upper()

4
homeassistant/components/media_player/__init__.py
View file

@ -777,7 +777,7 @@ async def _async_fetch_image(hass, url):
url = hass.config.api.base_url + url
if url not in cache_images:
cache_images[url] = {CACHE_LOCK: asyncio.Lock(loop=hass.loop)}
cache_images[url] = {CACHE_LOCK: asyncio.Lock()}
async with cache_images[url][CACHE_LOCK]:
if CACHE_CONTENT in cache_images[url]:
@ -786,7 +786,7 @@ async def _async_fetch_image(hass, url):
content, content_type = (None, None)
websession = async_get_clientsession(hass)
try:
with async_timeout.timeout(10, loop=hass.loop):
with async_timeout.timeout(10):
response = await websession.get(url)
if response.status == 200:

4
homeassistant/components/microsoft_face/__init__.py
View file

@ -277,7 +277,7 @@ class MicrosoftFace:
tasks.append(self._entities[g_id].async_update_ha_state())
if tasks:
await asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks)
async def call_api(self, method, function, data=None, binary=False,
params=None):
@ -297,7 +297,7 @@ class MicrosoftFace:
payload = None
try:
with async_timeout.timeout(self.timeout, loop=self.hass.loop):
with async_timeout.timeout(self.timeout):
response = await getattr(self.websession, method)(
url, data=payload, headers=headers, params=params)

2
homeassistant/components/mjpeg/camera.py
View file

@ -112,7 +112,7 @@ class MjpegCamera(Camera):
verify_ssl=self._verify_ssl
)
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
response = await websession.get(
self._still_image_url, auth=self._auth)

2
homeassistant/components/mobile_app/notify.py
View file

@ -115,7 +115,7 @@ class MobileAppNotificationService(BaseNotificationService):
data['registration_info'] = reg_info
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
response = await self._session.post(push_url, json=data)
result = await response.json()

2
homeassistant/components/mqtt/__init__.py
View file

@ -651,7 +651,7 @@ class MQTT:
self.birth_message = birth_message
self.connected = False
self._mqttc = None # type: mqtt.Client
self._paho_lock = asyncio.Lock(loop=hass.loop)
self._paho_lock = asyncio.Lock()
if protocol == PROTOCOL_31:
proto = mqtt.MQTTv31 # type: int

8
homeassistant/components/mysensors/gateway.py
View file

@ -151,9 +151,9 @@ async def finish_setup(hass, hass_config, gateways):
start_tasks.append(_gw_start(hass, gateway))
if discover_tasks:
# Make sure all devices and platforms are loaded before gateway start.
await asyncio.wait(discover_tasks, loop=hass.loop)
await asyncio.wait(discover_tasks)
if start_tasks:
await asyncio.wait(start_tasks, loop=hass.loop)
await asyncio.wait(start_tasks)
async def _discover_persistent_devices(hass, hass_config, gateway):
@ -172,7 +172,7 @@ async def _discover_persistent_devices(hass, hass_config, gateway):
tasks.append(discover_mysensors_platform(
hass, hass_config, platform, dev_ids))
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
async def _gw_start(hass, gateway):
@ -196,7 +196,7 @@ async def _gw_start(hass, gateway):
hass.data[gateway_ready_key] = gateway_ready
try:
with async_timeout.timeout(GATEWAY_READY_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(GATEWAY_READY_TIMEOUT):
await gateway_ready
except asyncio.TimeoutError:
_LOGGER.warning(

2
homeassistant/components/no_ip/__init__.py
View file

@ -89,7 +89,7 @@ async def _update_no_ip(hass, session, domain, auth_str, timeout):
}
try:
with async_timeout.timeout(timeout, loop=hass.loop):
with async_timeout.timeout(timeout):
resp = await session.get(url, params=params, headers=headers)
body = await resp.text()

2
homeassistant/components/notify/__init__.py
View file

@ -139,7 +139,7 @@ async def async_setup(hass, config):
in config_per_platform(config, DOMAIN)]
if setup_tasks:
await asyncio.wait(setup_tasks, loop=hass.loop)
await asyncio.wait(setup_tasks)
async def async_platform_discovered(platform, info):
"""Handle for discovered platform."""

2
homeassistant/components/onvif/camera.py
View file

@ -308,7 +308,7 @@ class ONVIFHassCamera(Camera):
image = await asyncio.shield(ffmpeg.get_image(
self._input, output_format=IMAGE_JPEG,
extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
extra_cmd=self._ffmpeg_arguments))
return image
async def handle_async_mjpeg_stream(self, request):

2
homeassistant/components/openalpr_cloud/image_processing.py
View file

@ -108,7 +108,7 @@ class OpenAlprCloudEntity(ImageProcessingAlprEntity):
}
try:
with async_timeout.timeout(self.timeout, loop=self.hass.loop):
with async_timeout.timeout(self.timeout):
request = await websession.post(
OPENALPR_API_URL, params=params, data=body
)

2
homeassistant/components/prowl/notify.py
View file

@ -52,7 +52,7 @@ class ProwlNotificationService(BaseNotificationService):
session = async_get_clientsession(self._hass)
try:
with async_timeout.timeout(10, loop=self._hass.loop):
with async_timeout.timeout(10):
response = await session.post(url, data=payload)
result = await response.text()

2
homeassistant/components/push/camera.py
View file

@ -60,7 +60,7 @@ async def async_setup_platform(hass, config, async_add_entities,
async def handle_webhook(hass, webhook_id, request):
"""Handle incoming webhook POST with image files."""
try:
with async_timeout.timeout(5, loop=hass.loop):
with async_timeout.timeout(5):
data = dict(await request.post())
except (asyncio.TimeoutError, aiohttp.web.HTTPException) as error:
_LOGGER.error("Could not get information from POST <%s>", error)

2
homeassistant/components/recorder/__init__.py
View file

@ -141,7 +141,7 @@ class Recorder(threading.Thread):
self.queue = queue.Queue() # type: Any
self.recording_start = dt_util.utcnow()
self.db_url = uri
self.async_db_ready = asyncio.Future(loop=hass.loop)
self.async_db_ready = asyncio.Future()
self.engine = None # type: Any
self.run_info = None # type: Any

2
homeassistant/components/recswitch/switch.py
View file

@ -33,7 +33,7 @@ async def async_setup_platform(hass, config, async_add_entities,
if not hass.data.get(DATA_RSN):
hass.data[DATA_RSN] = RSNetwork()
job = hass.data[DATA_RSN].create_datagram_endpoint(loop=hass.loop)
job = hass.data[DATA_RSN].create_datagram_endpoint()
hass.async_create_task(job)
device = hass.data[DATA_RSN].register_device(mac_address, host)

4
homeassistant/components/rest/switch.py
View file

@ -149,7 +149,7 @@ class RestSwitch(SwitchDevice):
"""Send a state update to the device."""
websession = async_get_clientsession(self.hass, self._verify_ssl)
with async_timeout.timeout(self._timeout, loop=self.hass.loop):
with async_timeout.timeout(self._timeout):
req = await getattr(websession, self._method)(
self._resource, auth=self._auth, data=bytes(body, 'utf-8'),
headers=self._headers)
@ -168,7 +168,7 @@ class RestSwitch(SwitchDevice):
"""Get the latest data from REST API and update the state."""
websession = async_get_clientsession(hass, self._verify_ssl)
with async_timeout.timeout(self._timeout, loop=hass.loop):
with async_timeout.timeout(self._timeout):
req = await websession.get(self._resource, auth=self._auth,
headers=self._headers)
text = await req.text()

2
homeassistant/components/rest_command/__init__.py
View file

@ -92,7 +92,7 @@ async def async_setup(hass, config):
'utf-8')
try:
with async_timeout.timeout(timeout, loop=hass.loop):
with async_timeout.timeout(timeout):
request = await getattr(websession, method)(
template_url.async_render(variables=service.data),
data=payload,

2
homeassistant/components/ring/camera.py
View file

@ -116,7 +116,7 @@ class RingCam(Camera):
image = await asyncio.shield(ffmpeg.get_image(
self._video_url, output_format=IMAGE_JPEG,
extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
extra_cmd=self._ffmpeg_arguments))
return image
async def handle_async_mjpeg_stream(self, request):

2
homeassistant/components/scene/__init__.py
View file

@ -70,7 +70,7 @@ async def async_setup(hass, config):
tasks = [scene.async_activate() for scene in target_scenes]
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
hass.services.async_register(
DOMAIN, SERVICE_TURN_ON, async_handle_scene_service,

2
homeassistant/components/script/__init__.py
View file

@ -82,7 +82,7 @@ async def async_setup(hass, config):
await asyncio.wait([
script.async_turn_off() for script
in await component.async_extract_from_service(service)
], loop=hass.loop)
])
async def toggle_service(service):
"""Toggle a script."""

2
homeassistant/components/sensibo/climate.py
View file

@ -101,7 +101,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(climate.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
hass.services.async_register(
DOMAIN, SERVICE_ASSUME_STATE, async_assume_state,
schema=ASSUME_STATE_SCHEMA)

2
homeassistant/components/sma/sensor.py
View file

@ -141,7 +141,7 @@ async def async_setup_platform(
if task:
tasks.append(task)
if tasks:
await asyncio.wait(tasks, loop=hass.loop)
await asyncio.wait(tasks)
interval = config.get(CONF_SCAN_INTERVAL) or timedelta(seconds=5)
async_track_time_interval(hass, async_sma, interval)

2
homeassistant/components/smhi/weather.py
View file

@ -107,7 +107,7 @@ class SmhiWeather(WeatherEntity):
RETRY_TIMEOUT, self.retry_update())
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
self._forecasts = await self.get_weather_forecast()
self._fail_count = 0

2
homeassistant/components/sonos/media_player.py
View file

@ -63,7 +63,7 @@ class SonosData:
def __init__(self, hass):
"""Initialize the data."""
self.entities = []
self.topology_condition = asyncio.Condition(loop=hass.loop)
self.topology_condition = asyncio.Condition()
async def async_setup_platform(hass,

4
homeassistant/components/squeezebox/media_player.py
View file

@ -128,7 +128,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(player.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
for service in SERVICE_TO_METHOD:
schema = SERVICE_TO_METHOD[service]['schema']
@ -179,7 +179,7 @@ class LogitechMediaServer:
try:
websession = async_get_clientsession(self.hass)
with async_timeout.timeout(TIMEOUT, loop=self.hass.loop):
with async_timeout.timeout(TIMEOUT):
response = await websession.post(
url,
data=data,

2
homeassistant/components/startca/sensor.py
View file

@ -138,7 +138,7 @@ class StartcaData:
_LOGGER.debug("Updating Start.ca usage data")
url = 'https://www.start.ca/support/usage/api?key=' + \
self.api_key
with async_timeout.timeout(REQUEST_TIMEOUT, loop=self.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
req = await self.websession.get(url)
if req.status != 200:
_LOGGER.error("Request failed with status: %u", req.status)

3
homeassistant/components/switcher_kis/__init__.py
View file

@ -62,8 +62,7 @@ async def async_setup(hass: HomeAssistantType, config: Dict) -> bool:
EVENT_HOMEASSISTANT_STOP, async_stop_bridge))
try:
device_data = await wait_for(
v2bridge.queue.get(), timeout=10.0, loop=hass.loop)
device_data = await wait_for(v2bridge.queue.get(), timeout=10.0)
except (Asyncio_TimeoutError, RuntimeError):
_LOGGER.exception("failed to get response from device")
await v2bridge.stop()

2
homeassistant/components/tado/device_tracker.py
View file

@ -61,7 +61,7 @@ class TadoDeviceScanner(DeviceScanner):
self.tadoapiurl += '?username={username}&password={password}'
self.websession = async_create_clientsession(
hass, cookie_jar=aiohttp.CookieJar(unsafe=True, loop=hass.loop))
hass, cookie_jar=aiohttp.CookieJar(unsafe=True))
self.success_init = asyncio.run_coroutine_threadsafe(
self._async_update_info(), hass.loop

2
homeassistant/components/teksavvy/sensor.py
View file

@ -132,7 +132,7 @@ class TekSavvyData:
_LOGGER.debug("Updating TekSavvy data")
url = "https://api.teksavvy.com/"\
"web/Usage/UsageSummaryRecords?$filter=IsCurrent%20eq%20true"
with async_timeout.timeout(REQUEST_TIMEOUT, loop=self.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
req = await self.websession.get(url, headers=headers)
if req.status != 200:
_LOGGER.error("Request failed with status: %u", req.status)

2
homeassistant/components/thethingsnetwork/sensor.py
View file

@ -124,7 +124,7 @@ class TtnDataStorage:
"""Get the current state from The Things Network Data Storage."""
try:
session = async_get_clientsession(self._hass)
with async_timeout.timeout(DEFAULT_TIMEOUT, loop=self._hass.loop):
with async_timeout.timeout(DEFAULT_TIMEOUT):
response = await session.get(self._url, headers=self._headers)
except (asyncio.TimeoutError, aiohttp.ClientError):

2
homeassistant/components/tradfri/config_flow.py
View file

@ -143,7 +143,7 @@ async def authenticate(hass, host, security_code):
identity = uuid4().hex
api_factory = APIFactory(host, psk_id=identity, loop=hass.loop)
api_factory = APIFactory(host, psk_id=identity)
try:
with async_timeout.timeout(5):

2
homeassistant/components/tts/__init__.py
View file

@ -165,7 +165,7 @@ async def async_setup(hass, config):
in config_per_platform(config, DOMAIN)]
if setup_tasks:
await asyncio.wait(setup_tasks, loop=hass.loop)
await asyncio.wait(setup_tasks)
async def async_clear_cache_handle(service):
"""Handle clear cache service call."""

4
homeassistant/components/upc_connect/device_tracker.py
View file

@ -81,7 +81,7 @@ class UPCDeviceScanner(DeviceScanner):
"""Get first token."""
try:
# get first token
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
response = await self.websession.get(
"http://{}/common_page/login.html".format(self.host),
headers=self.headers)
@ -99,7 +99,7 @@ class UPCDeviceScanner(DeviceScanner):
async def _async_ws_function(self, function):
"""Execute a command on UPC firmware webservice."""
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
# The 'token' parameter has to be first, and 'fun' second
# or the UPC firmware will return an error
response = await self.websession.post(

2
homeassistant/components/updater/__init__.py
View file

@ -136,7 +136,7 @@ async def get_newest_version(hass, huuid, include_components):
session = async_get_clientsession(hass)
try:
with async_timeout.timeout(5, loop=hass.loop):
with async_timeout.timeout(5):
req = await session.post(UPDATER_URL, json=info_object)
_LOGGER.info(("Submitted analytics to Home Assistant servers. "
"Information submitted includes %s"), info_object)

2
homeassistant/components/viaggiatreno/sensor.py
View file

@ -67,7 +67,7 @@ async def async_http_request(hass, uri):
"""Perform actual request."""
try:
session = hass.helpers.aiohttp_client.async_get_clientsession(hass)
with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
with async_timeout.timeout(REQUEST_TIMEOUT):
req = await session.get(uri)
if req.status != 200:
return {'error': req.status}

2
homeassistant/components/voicerss/tts.py
View file

@ -116,7 +116,7 @@ class VoiceRSSProvider(Provider):
form_data['hl'] = language
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
request = await websession.post(
VOICERSS_API_URL, data=form_data
)

4
homeassistant/components/websocket_api/http.py
View file

@ -40,7 +40,7 @@ class WebSocketHandler:
self.hass = hass
self.request = request
self.wsock = None
self._to_write = asyncio.Queue(maxsize=MAX_PENDING_MSG, loop=hass.loop)
self._to_write = asyncio.Queue(maxsize=MAX_PENDING_MSG)
self._handle_task = None
self._writer_task = None
self._logger = logging.getLogger(
@ -101,7 +101,7 @@ class WebSocketHandler:
# pylint: disable=no-member
self._handle_task = asyncio.current_task()
else:
self._handle_task = asyncio.Task.current_task(loop=self.hass.loop)
self._handle_task = asyncio.Task.current_task()
@callback
def handle_hass_stop(event):

2
homeassistant/components/worxlandroid/sensor.py
View file

@ -88,7 +88,7 @@ class WorxLandroidSensor(Entity):
try:
session = async_get_clientsession(self.hass)
with async_timeout.timeout(self.timeout, loop=self.hass.loop):
with async_timeout.timeout(self.timeout):
auth = aiohttp.helpers.BasicAuth('admin', self.pin)
mower_response = await session.get(self.url, auth=auth)
except (asyncio.TimeoutError, aiohttp.ClientError):

2
homeassistant/components/wunderground/sensor.py
View file

@ -807,7 +807,7 @@ class WUndergroundData:
async def async_update(self):
"""Get the latest data from WUnderground."""
try:
with async_timeout.timeout(10, loop=self._hass.loop):
with async_timeout.timeout(10):
response = await self._session.get(self._build_url())
result = await response.json()
if "error" in result['response']:

2
homeassistant/components/xiaomi/camera.py
View file

@ -140,7 +140,7 @@ class XiaomiCamera(Camera):
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
self._last_image = await asyncio.shield(ffmpeg.get_image(
url, output_format=IMAGE_JPEG,
extra_cmd=self._extra_arguments), loop=self.hass.loop)
extra_cmd=self._extra_arguments))
self._last_url = url
return self._last_image

2
homeassistant/components/xiaomi_miio/fan.py
View file

@ -467,7 +467,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(device.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
for air_purifier_service in SERVICE_TO_METHOD:
schema = SERVICE_TO_METHOD[air_purifier_service].get(

2
homeassistant/components/xiaomi_miio/light.py
View file

@ -203,7 +203,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(target_device.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
for xiaomi_miio_service in SERVICE_TO_METHOD:
schema = SERVICE_TO_METHOD[xiaomi_miio_service].get(

2
homeassistant/components/xiaomi_miio/remote.py
View file

@ -142,7 +142,7 @@ async def async_setup_platform(hass, config, async_add_entities,
message['error']['message'] == "learn timeout"):
await hass.async_add_executor_job(device.learn, slot)
await asyncio.sleep(1, loop=hass.loop)
await asyncio.sleep(1)
_LOGGER.error("Timeout. No infrared command captured")
hass.components.persistent_notification.async_create(

2
homeassistant/components/xiaomi_miio/switch.py
View file

@ -185,7 +185,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(device.async_update_ha_state(True))
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
for plug_service in SERVICE_TO_METHOD:
schema = SERVICE_TO_METHOD[plug_service].get('schema', SERVICE_SCHEMA)

2
homeassistant/components/xiaomi_miio/vacuum.py
View file

@ -165,7 +165,7 @@ async def async_setup_platform(hass, config, async_add_entities,
update_tasks.append(update_coro)
if update_tasks:
await asyncio.wait(update_tasks, loop=hass.loop)
await asyncio.wait(update_tasks)
for vacuum_service in SERVICE_TO_METHOD:
schema = SERVICE_TO_METHOD[vacuum_service].get(

2
homeassistant/components/yandextts/tts.py
View file

@ -111,7 +111,7 @@ class YandexSpeechKitProvider(Provider):
options = options or {}
try:
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
url_param = {
'text': message,
'lang': actual_language,

2
homeassistant/components/yi/camera.py
View file

@ -77,7 +77,7 @@ class YiCamera(Camera):
"""Retrieve the latest video file from the customized Yi FTP server."""
from aioftp import Client, StatusCodeError
ftp = Client(loop=self.hass.loop)
ftp = Client()
try:
await ftp.connect(self.host)
await ftp.login(self.user, self.passwd)

4
homeassistant/components/yr/sensor.py
View file

@ -160,7 +160,7 @@ class YrData:
async_call_later(self.hass, minutes*60, self.fetching_data)
try:
websession = async_get_clientsession(self.hass)
with async_timeout.timeout(10, loop=self.hass.loop):
with async_timeout.timeout(10):
resp = await websession.get(
self._url, params=self._urlparams)
if resp.status != 200:
@ -247,4 +247,4 @@ class YrData:
tasks.append(dev.async_update_ha_state())
if tasks:
await asyncio.wait(tasks, loop=self.hass.loop)
await asyncio.wait(tasks)

Some files were not shown because too many files have changed in this diff Show more