From 0c796fc3c3cb79d2655283f1808e1f2938c78368 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 11 Dec 2019 13:28:50 +0100 Subject: [PATCH] Remove uvloop event policy (#29835) * Remove uvloop event policy * Clean tests * Fix lint * Cleanup statment --- homeassistant/__main__.py | 12 +----------- tests/conftest.py | 6 ------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py index 2cecd1217f9..bf3042c3f88 100644 --- a/homeassistant/__main__.py +++ b/homeassistant/__main__.py @@ -15,12 +15,10 @@ if TYPE_CHECKING: def set_loop() -> None: - """Attempt to use uvloop.""" + """Attempt to use different loop.""" import asyncio from asyncio.events import BaseDefaultEventLoopPolicy - policy = None - if sys.platform == "win32": if hasattr(asyncio, "WindowsProactorEventLoopPolicy"): # pylint: disable=no-member @@ -33,15 +31,7 @@ def set_loop() -> None: _loop_factory = asyncio.ProactorEventLoop policy = ProactorPolicy() - else: - try: - import uvloop - except ImportError: - pass - else: - policy = uvloop.EventLoopPolicy() - if policy is not None: asyncio.set_event_loop_policy(policy) diff --git a/tests/conftest.py b/tests/conftest.py index 41b4757c92e..262acda6314 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,8 +1,6 @@ """Set up some common test helper things.""" -import asyncio import functools import logging -import os from unittest.mock import patch import pytest @@ -25,10 +23,6 @@ from tests.common import ( # noqa: E402, isort:skip ) from tests.test_util.aiohttp import mock_aiohttp_client # noqa: E402, isort:skip -if os.environ.get("UVLOOP") == "1": - import uvloop - - asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) logging.basicConfig(level=logging.DEBUG) logging.getLogger("sqlalchemy.engine").setLevel(logging.INFO)