From f5cc40024d9cf4b3bb10a86494c61205eb1d8d45 Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Sun, 11 Mar 2018 18:01:12 +0100
Subject: [PATCH] Rename homeassistant.util.async to .async_ (#13088)

"async" is (going to be) a reserved word.
---
 docs/source/api/util.rst                                      | 4 ++--
 homeassistant/__main__.py                                     | 2 +-
 homeassistant/components/camera/generic.py                    | 2 +-
 homeassistant/components/camera/proxy.py                      | 2 +-
 homeassistant/components/configurator.py                      | 2 +-
 homeassistant/components/device_tracker/__init__.py           | 2 +-
 homeassistant/components/group/__init__.py                    | 2 +-
 .../components/image_processing/microsoft_face_identify.py    | 2 +-
 homeassistant/components/image_processing/openalpr_local.py   | 2 +-
 homeassistant/components/mqtt/__init__.py                     | 2 +-
 homeassistant/components/zone.py                              | 2 +-
 homeassistant/core.py                                         | 2 +-
 homeassistant/helpers/condition.py                            | 2 +-
 homeassistant/helpers/discovery.py                            | 2 +-
 homeassistant/helpers/dispatcher.py                           | 2 +-
 homeassistant/helpers/entity.py                               | 2 +-
 homeassistant/helpers/entity_platform.py                      | 2 +-
 homeassistant/helpers/event.py                                | 2 +-
 homeassistant/helpers/script.py                               | 2 +-
 homeassistant/helpers/service.py                              | 2 +-
 homeassistant/helpers/state.py                                | 2 +-
 homeassistant/helpers/template.py                             | 2 +-
 homeassistant/setup.py                                        | 2 +-
 homeassistant/util/{async.py => async_.py}                    | 0
 homeassistant/util/logging.py                                 | 2 +-
 tests/common.py                                               | 2 +-
 tests/components/binary_sensor/test_template.py               | 2 +-
 tests/components/camera/test_init.py                          | 2 +-
 tests/components/climate/test_generic_thermostat.py           | 2 +-
 tests/components/device_tracker/test_init.py                  | 2 +-
 tests/components/device_tracker/test_owntracks.py             | 2 +-
 tests/components/device_tracker/test_upc_connect.py           | 2 +-
 tests/components/emulated_hue/test_upnp.py                    | 2 +-
 tests/components/media_player/test_async_helpers.py           | 2 +-
 tests/components/media_player/test_universal.py               | 2 +-
 tests/components/notify/test_group.py                         | 2 +-
 tests/components/sensor/test_uptime.py                        | 2 +-
 tests/components/switch/test_rest.py                          | 2 +-
 tests/components/test_init.py                                 | 2 +-
 tests/helpers/test_aiohttp_client.py                          | 2 +-
 tests/helpers/test_state.py                                   | 2 +-
 tests/test_config.py                                          | 2 +-
 tests/test_core.py                                            | 2 +-
 tests/util/test_async.py                                      | 2 +-
 44 files changed, 44 insertions(+), 44 deletions(-)
 rename homeassistant/util/{async.py => async_.py} (100%)

diff --git a/docs/source/api/util.rst b/docs/source/api/util.rst
index e31a1c98129..fb61cd94fe6 100644
--- a/docs/source/api/util.rst
+++ b/docs/source/api/util.rst
@@ -4,10 +4,10 @@ homeassistant.util package
 Submodules
 ----------
 
-homeassistant.util.async module
+homeassistant.util.async_ module
 -------------------------------
 
-.. automodule:: homeassistant.util.async
+.. automodule:: homeassistant.util.async_
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index 319d00e6de5..3f6e0ef220f 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -272,7 +272,7 @@ def setup_and_run_hass(config_dir: str,
 
     if args.open_ui:
         # Imported here to avoid importing asyncio before monkey patch
-        from homeassistant.util.async import run_callback_threadsafe
+        from homeassistant.util.async_ import run_callback_threadsafe
 
         def open_browser(event):
             """Open the webinterface in a browser."""
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index 3f8c4bedc75..2f5d8d28979 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -21,7 +21,7 @@ from homeassistant.components.camera import (
     PLATFORM_SCHEMA, DEFAULT_CONTENT_TYPE, Camera)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers import config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/camera/proxy.py b/homeassistant/components/camera/proxy.py
index 56b9db5c0ec..d045235c3ad 100644
--- a/homeassistant/components/camera/proxy.py
+++ b/homeassistant/components/camera/proxy.py
@@ -11,7 +11,7 @@ import async_timeout
 
 import voluptuous as vol
 
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.helpers import config_validation as cv
 
 import homeassistant.util.dt as dt_util
diff --git a/homeassistant/components/configurator.py b/homeassistant/components/configurator.py
index eaba08f0e89..2c159633a9b 100644
--- a/homeassistant/components/configurator.py
+++ b/homeassistant/components/configurator.py
@@ -15,7 +15,7 @@ from homeassistant.const import EVENT_TIME_CHANGED, ATTR_FRIENDLY_NAME, \
     ATTR_ENTITY_PICTURE
 from homeassistant.loader import bind_hass
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 _KEY_INSTANCE = 'configurator'
diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py
index 9fea2bc104d..682496335a0 100644
--- a/homeassistant/components/device_tracker/__init__.py
+++ b/homeassistant/components/device_tracker/__init__.py
@@ -28,7 +28,7 @@ from homeassistant.helpers.typing import GPSType, ConfigType, HomeAssistantType
 import homeassistant.helpers.config_validation as cv
 from homeassistant.loader import get_component
 import homeassistant.util as util
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.util.yaml import dump
 
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 3ece434f3c1..67ad8066aff 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.entity import Entity, async_generate_entity_id
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_change
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 DOMAIN = 'group'
 
diff --git a/homeassistant/components/image_processing/microsoft_face_identify.py b/homeassistant/components/image_processing/microsoft_face_identify.py
index 258731326ee..51f1cd42f47 100644
--- a/homeassistant/components/image_processing/microsoft_face_identify.py
+++ b/homeassistant/components/image_processing/microsoft_face_identify.py
@@ -17,7 +17,7 @@ from homeassistant.components.image_processing import (
     PLATFORM_SCHEMA, ImageProcessingEntity, CONF_CONFIDENCE, CONF_SOURCE,
     CONF_ENTITY_ID, CONF_NAME, ATTR_ENTITY_ID, ATTR_CONFIDENCE)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 DEPENDENCIES = ['microsoft_face']
 
diff --git a/homeassistant/components/image_processing/openalpr_local.py b/homeassistant/components/image_processing/openalpr_local.py
index ce06d98bf13..227e3269628 100644
--- a/homeassistant/components/image_processing/openalpr_local.py
+++ b/homeassistant/components/image_processing/openalpr_local.py
@@ -17,7 +17,7 @@ from homeassistant.const import STATE_UNKNOWN, CONF_REGION
 from homeassistant.components.image_processing import (
     PLATFORM_SCHEMA, ImageProcessingEntity, CONF_CONFIDENCE, CONF_SOURCE,
     CONF_ENTITY_ID, CONF_NAME, ATTR_ENTITY_ID, ATTR_CONFIDENCE)
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 27e7c0358ad..590e16747c5 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -27,7 +27,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import bind_hass
 from homeassistant.helpers import template, config_validation as cv
 from homeassistant.helpers.entity import Entity
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe)
 from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP, CONF_VALUE_TEMPLATE, CONF_USERNAME,
diff --git a/homeassistant/components/zone.py b/homeassistant/components/zone.py
index 9ba503e6666..b1a94f3809c 100644
--- a/homeassistant/components/zone.py
+++ b/homeassistant/components/zone.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 from homeassistant.loader import bind_hass
 from homeassistant.helpers import config_per_platform
 from homeassistant.helpers.entity import Entity, async_generate_entity_id
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 from homeassistant.util.location import distance
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 543aba2a0e7..a486ee1adbf 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 from homeassistant import loader
 from homeassistant.exceptions import (
     HomeAssistantError, InvalidEntityFormatError, InvalidStateError)
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe,
     fire_coroutine_threadsafe)
 import homeassistant.util as util
diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py
index bad6bfe83c3..f8f841cc449 100644
--- a/homeassistant/helpers/condition.py
+++ b/homeassistant/helpers/condition.py
@@ -18,7 +18,7 @@ from homeassistant.exceptions import TemplateError, HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.sun import get_astral_event_date
 import homeassistant.util.dt as dt_util
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 FROM_CONFIG_FORMAT = '{}_from_config'
 ASYNC_FROM_CONFIG_FORMAT = 'async_{}_from_config'
diff --git a/homeassistant/helpers/discovery.py b/homeassistant/helpers/discovery.py
index 6a527021c77..82322fec1e5 100644
--- a/homeassistant/helpers/discovery.py
+++ b/homeassistant/helpers/discovery.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     ATTR_DISCOVERED, ATTR_SERVICE, EVENT_PLATFORM_DISCOVERED)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import DEPENDENCY_BLACKLIST
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 EVENT_LOAD_PLATFORM = 'load_platform.{}'
 ATTR_PLATFORM = 'platform'
diff --git a/homeassistant/helpers/dispatcher.py b/homeassistant/helpers/dispatcher.py
index 8c41505bd29..136f4caa35a 100644
--- a/homeassistant/helpers/dispatcher.py
+++ b/homeassistant/helpers/dispatcher.py
@@ -3,7 +3,7 @@ import logging
 
 from homeassistant.core import callback
 from homeassistant.loader import bind_hass
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index f23a49c1851..4efe8d2f6c3 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -15,7 +15,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.config import DATA_CUSTOMIZE
 from homeassistant.exceptions import NoEntitySpecifiedError
 from homeassistant.util import ensure_unique_string, slugify
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 SLOW_UPDATE_WARNING = 10
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index d28212a34d1..712121bbdb5 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import callback, valid_entity_id, split_entity_id
 from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_callback_threadsafe, run_coroutine_threadsafe)
 import homeassistant.util.dt as dt_util
 
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index eab2d583f45..d69a556b0cc 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -8,7 +8,7 @@ from ..core import HomeAssistant, callback
 from ..const import (
     ATTR_NOW, EVENT_STATE_CHANGED, EVENT_TIME_CHANGED, MATCH_ALL)
 from ..util import dt as dt_util
-from ..util.async import run_callback_threadsafe
+from ..util.async_ import run_callback_threadsafe
 
 # PyLint does not like the use of threaded_listener_factory
 # pylint: disable=invalid-name
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 6530cb62485..abfdde8c8e1 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -16,7 +16,7 @@ from homeassistant.helpers.event import (
     async_track_point_in_utc_time, async_track_template)
 from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as date_util
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe)
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index 7118cab211a..3595b258f12 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -13,7 +13,7 @@ from homeassistant.helpers import template
 from homeassistant.loader import get_component, bind_hass
 from homeassistant.util.yaml import load_yaml
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 CONF_SERVICE = 'service'
 CONF_SERVICE_TEMPLATE = 'service_template'
diff --git a/homeassistant/helpers/state.py b/homeassistant/helpers/state.py
index 6be0dbae914..f97d7051459 100644
--- a/homeassistant/helpers/state.py
+++ b/homeassistant/helpers/state.py
@@ -40,7 +40,7 @@ from homeassistant.const import (
     STATE_ON, STATE_OPEN, STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN,
     STATE_UNLOCKED, SERVICE_SELECT_OPTION)
 from homeassistant.core import State
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 6fab1c6c844..3dd65aa362c 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -20,7 +20,7 @@ from homeassistant.loader import bind_hass, get_component
 from homeassistant.util import convert
 from homeassistant.util import dt as dt_util
 from homeassistant.util import location as loc_util
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 _SENTINEL = object()
diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index 5be1547242e..169a160af65 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -10,7 +10,7 @@ from homeassistant import requirements, core, loader, config as conf_util
 from homeassistant.config import async_notify_setup_error
 from homeassistant.const import EVENT_COMPONENT_LOADED, PLATFORM_FORMAT
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/util/async.py b/homeassistant/util/async_.py
similarity index 100%
rename from homeassistant/util/async.py
rename to homeassistant/util/async_.py
diff --git a/homeassistant/util/logging.py b/homeassistant/util/logging.py
index 8a15c4f6320..f7306cae98b 100644
--- a/homeassistant/util/logging.py
+++ b/homeassistant/util/logging.py
@@ -3,7 +3,7 @@ import asyncio
 import logging
 import threading
 
-from .async import run_coroutine_threadsafe
+from .async_ import run_coroutine_threadsafe
 
 
 class HideSensitiveDataFilter(logging.Filter):
diff --git a/tests/common.py b/tests/common.py
index 15ce80a9552..bc84b3493a8 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED, EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE,
     ATTR_DISCOVERED, SERVER_PORT, EVENT_HOMEASSISTANT_CLOSE)
 from homeassistant.components import mqtt, recorder
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_callback_threadsafe, run_coroutine_threadsafe)
 
 _TEST_INSTANCE_PORT = SERVER_PORT
diff --git a/tests/components/binary_sensor/test_template.py b/tests/components/binary_sensor/test_template.py
index c47f23bf902..18c095f4bc1 100644
--- a/tests/components/binary_sensor/test_template.py
+++ b/tests/components/binary_sensor/test_template.py
@@ -9,7 +9,7 @@ from homeassistant import setup
 from homeassistant.components.binary_sensor import template
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import template as template_hlpr
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 import homeassistant.util.dt as dt_util
 
 from tests.common import (
diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py
index 87612da9faa..465d6276ad5 100644
--- a/tests/components/camera/test_init.py
+++ b/tests/components/camera/test_init.py
@@ -9,7 +9,7 @@ from homeassistant.const import ATTR_ENTITY_PICTURE
 import homeassistant.components.camera as camera
 import homeassistant.components.http as http
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import (
     get_test_home_assistant, get_test_instance_port, assert_setup_component)
diff --git a/tests/components/climate/test_generic_thermostat.py b/tests/components/climate/test_generic_thermostat.py
index abc9e6d74c2..bd0b764c6fe 100644
--- a/tests/components/climate/test_generic_thermostat.py
+++ b/tests/components/climate/test_generic_thermostat.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant import loader
 from homeassistant.util.unit_system import METRIC_SYSTEM
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.components import climate, input_boolean, switch
 import homeassistant.components as comps
 from tests.common import (assert_setup_component, get_test_home_assistant,
diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py
index 9d122fa17b6..c051983d8fa 100644
--- a/tests/components/device_tracker/test_init.py
+++ b/tests/components/device_tracker/test_init.py
@@ -13,7 +13,7 @@ from homeassistant.core import callback, State
 from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.helpers import discovery
 from homeassistant.loader import get_component
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME, ATTR_HIDDEN,
diff --git a/tests/components/device_tracker/test_owntracks.py b/tests/components/device_tracker/test_owntracks.py
index 2239e13e220..37a3e570b53 100644
--- a/tests/components/device_tracker/test_owntracks.py
+++ b/tests/components/device_tracker/test_owntracks.py
@@ -11,7 +11,7 @@ import homeassistant.components.device_tracker.owntracks as owntracks
 from homeassistant.setup import setup_component
 from homeassistant.components import device_tracker
 from homeassistant.const import CONF_PLATFORM, STATE_NOT_HOME
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 USER = 'greg'
 DEVICE = 'phone'
diff --git a/tests/components/device_tracker/test_upc_connect.py b/tests/components/device_tracker/test_upc_connect.py
index 396d2b88b19..e45d70bc172 100644
--- a/tests/components/device_tracker/test_upc_connect.py
+++ b/tests/components/device_tracker/test_upc_connect.py
@@ -10,7 +10,7 @@ from homeassistant.const import (
     CONF_PLATFORM, CONF_HOST)
 from homeassistant.components.device_tracker import DOMAIN
 import homeassistant.components.device_tracker.upc_connect as platform
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, load_fixture,
diff --git a/tests/components/emulated_hue/test_upnp.py b/tests/components/emulated_hue/test_upnp.py
index b3032954431..555802f9a2c 100644
--- a/tests/components/emulated_hue/test_upnp.py
+++ b/tests/components/emulated_hue/test_upnp.py
@@ -9,7 +9,7 @@ from aiohttp.hdrs import CONTENT_TYPE
 from homeassistant import setup, const, core
 import homeassistant.components as core_components
 from homeassistant.components import emulated_hue, http
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import get_test_instance_port, get_test_home_assistant
 
diff --git a/tests/components/media_player/test_async_helpers.py b/tests/components/media_player/test_async_helpers.py
index 6acbf5c2db3..11e324e9132 100644
--- a/tests/components/media_player/test_async_helpers.py
+++ b/tests/components/media_player/test_async_helpers.py
@@ -5,7 +5,7 @@ import asyncio
 import homeassistant.components.media_player as mp
 from homeassistant.const import (
     STATE_PLAYING, STATE_PAUSED, STATE_ON, STATE_OFF, STATE_IDLE)
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import get_test_home_assistant
 
diff --git a/tests/components/media_player/test_universal.py b/tests/components/media_player/test_universal.py
index b7f3165f11c..c9a1cdc79d8 100644
--- a/tests/components/media_player/test_universal.py
+++ b/tests/components/media_player/test_universal.py
@@ -11,7 +11,7 @@ import homeassistant.components.input_number as input_number
 import homeassistant.components.input_select as input_select
 import homeassistant.components.media_player as media_player
 import homeassistant.components.media_player.universal as universal
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import mock_service, get_test_home_assistant
 
diff --git a/tests/components/notify/test_group.py b/tests/components/notify/test_group.py
index ed988b0f9b5..c96a49d7cb3 100644
--- a/tests/components/notify/test_group.py
+++ b/tests/components/notify/test_group.py
@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
 from homeassistant.setup import setup_component
 import homeassistant.components.notify as notify
 from homeassistant.components.notify import group, demo
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import assert_setup_component, get_test_home_assistant
 
diff --git a/tests/components/sensor/test_uptime.py b/tests/components/sensor/test_uptime.py
index 541ea7ca771..a919e7d20db 100644
--- a/tests/components/sensor/test_uptime.py
+++ b/tests/components/sensor/test_uptime.py
@@ -3,7 +3,7 @@ import unittest
 from unittest.mock import patch
 from datetime import timedelta
 
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.setup import setup_component
 from homeassistant.components.sensor.uptime import UptimeSensor
 from tests.common import get_test_home_assistant
diff --git a/tests/components/switch/test_rest.py b/tests/components/switch/test_rest.py
index 064d0b1825b..e3f11ec19a0 100644
--- a/tests/components/switch/test_rest.py
+++ b/tests/components/switch/test_rest.py
@@ -5,7 +5,7 @@ import aiohttp
 
 import homeassistant.components.switch.rest as rest
 from homeassistant.setup import setup_component
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.helpers.template import Template
 from tests.common import get_test_home_assistant, assert_setup_component
 
diff --git a/tests/components/test_init.py b/tests/components/test_init.py
index eca4763b4b3..991982af9b2 100644
--- a/tests/components/test_init.py
+++ b/tests/components/test_init.py
@@ -14,7 +14,7 @@ import homeassistant.components as comps
 import homeassistant.helpers.intent as intent
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import (
     get_test_home_assistant, mock_service, patch_yaml_files, mock_coro,
diff --git a/tests/helpers/test_aiohttp_client.py b/tests/helpers/test_aiohttp_client.py
index f5415ffe212..abe30d80a49 100644
--- a/tests/helpers/test_aiohttp_client.py
+++ b/tests/helpers/test_aiohttp_client.py
@@ -8,7 +8,7 @@ import pytest
 from homeassistant.core import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.setup import async_setup_component
 import homeassistant.helpers.aiohttp_client as client
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 from tests.common import get_test_home_assistant
 
diff --git a/tests/helpers/test_state.py b/tests/helpers/test_state.py
index cc42bc8d7f8..f230d03e51e 100644
--- a/tests/helpers/test_state.py
+++ b/tests/helpers/test_state.py
@@ -7,7 +7,7 @@ from unittest.mock import patch
 import homeassistant.core as ha
 import homeassistant.components as core_components
 from homeassistant.const import (SERVICE_TURN_ON, SERVICE_TURN_OFF)
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.util import dt as dt_util
 from homeassistant.helpers import state
 from homeassistant.const import (
diff --git a/tests/test_config.py b/tests/test_config.py
index 99c21493711..ab6b860ea8f 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     CONF_UNIT_SYSTEM_METRIC, CONF_UNIT_SYSTEM_IMPERIAL, CONF_TEMPERATURE_UNIT)
 from homeassistant.util import location as location_util, dt as dt_util
 from homeassistant.util.yaml import SECRET_YAML
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.helpers.entity import Entity
 from homeassistant.components.config.group import (
     CONFIG_PATH as GROUP_CONFIG_PATH)
diff --git a/tests/test_core.py b/tests/test_core.py
index 261b6385b04..7a1610c0966 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -14,7 +14,7 @@ import pytest
 import homeassistant.core as ha
 from homeassistant.exceptions import (InvalidEntityFormatError,
                                       InvalidStateError)
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.util.unit_system import (METRIC_SYSTEM)
 from homeassistant.const import (
diff --git a/tests/util/test_async.py b/tests/util/test_async.py
index b6ae58a484f..3e57ea20b5c 100644
--- a/tests/util/test_async.py
+++ b/tests/util/test_async.py
@@ -5,7 +5,7 @@ from unittest import TestCase
 
 import pytest
 
-from homeassistant.util import async as hasync
+from homeassistant.util import async_ as hasync
 
 
 @patch('asyncio.coroutines.iscoroutine')