From 84ab2d9a1d160a3c9da7e47731cf27afad4051a5 Mon Sep 17 00:00:00 2001 From: Matthias Urlichs Date: Sat, 15 Sep 2018 11:06:46 +0200 Subject: [PATCH] move run_asyncio to homeassistant.util.async_ --- homeassistant/__main__.py | 2 +- homeassistant/util/__init__.py | 9 --------- homeassistant/util/async_.py | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py index aa559a39fa3b15..0c5fbd34a6d0c6 100644 --- a/homeassistant/__main__.py +++ b/homeassistant/__main__.py @@ -360,7 +360,7 @@ def main() -> int: if args.pid_file: write_pid(args.pid_file) - from homeassistant.util import asyncio_run + from homeassistant.util.async_ import asyncio_run exit_code = asyncio_run(setup_and_run_hass(config_dir, args)) if exit_code == RESTART_EXIT_CODE and not args.runner: try_to_restart() diff --git a/homeassistant/util/__init__.py b/homeassistant/util/__init__.py index e64b8a2e04296f..17849154ff766c 100644 --- a/homeassistant/util/__init__.py +++ b/homeassistant/util/__init__.py @@ -30,15 +30,6 @@ } -try: - asyncio_run = asyncio.run -except AttributeError: - def asyncio_run(main, *, debug=False): - loop = asyncio.new_event_loop() - loop.set_debug(debug) - return loop.run(main) - - def sanitize_filename(filename: str) -> str: r"""Sanitize a filename by removing .. / and \\.""" return RE_SANITIZE_FILENAME.sub("", filename) diff --git a/homeassistant/util/async_.py b/homeassistant/util/async_.py index fcfe790df54122..4deea6d1f8193a 100644 --- a/homeassistant/util/async_.py +++ b/homeassistant/util/async_.py @@ -13,6 +13,15 @@ _LOGGER = logging.getLogger(__name__) +try: + asyncio_run = asyncio.run +except AttributeError: + def asyncio_run(main, *, debug=False): + loop = asyncio.new_event_loop() + loop.set_debug(debug) + return loop.run(main) + + def _set_result_unless_cancelled(fut: Future, result: Any) -> None: """Set the result only if the Future was not cancelled.""" if fut.cancelled():