From 564fed787986f43fafae707be62ca8890010637a Mon Sep 17 00:00:00 2001 From: springstan <46536646+springstan@users.noreply.github.com> Date: Thu, 5 Dec 2019 12:50:53 +0100 Subject: [PATCH] Move imports to top for ambient_station (#29497) --- homeassistant/components/ambient_station/__init__.py | 2 +- homeassistant/components/ambient_station/config_flow.py | 4 ++-- tests/components/ambient_station/test_config_flow.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/ambient_station/__init__.py b/homeassistant/components/ambient_station/__init__.py index 7a805d6b867..58389dd1831 100644 --- a/homeassistant/components/ambient_station/__init__.py +++ b/homeassistant/components/ambient_station/__init__.py @@ -8,8 +8,8 @@ import voluptuous as vol from homeassistant.config_entries import SOURCE_IMPORT from homeassistant.const import ( - ATTR_NAME, ATTR_LOCATION, + ATTR_NAME, CONF_API_KEY, EVENT_HOMEASSISTANT_STOP, ) diff --git a/homeassistant/components/ambient_station/config_flow.py b/homeassistant/components/ambient_station/config_flow.py index 256e55ba402..c20b43598ca 100644 --- a/homeassistant/components/ambient_station/config_flow.py +++ b/homeassistant/components/ambient_station/config_flow.py @@ -1,4 +1,6 @@ """Config flow to configure the Ambient PWS component.""" +from aioambient import Client +from aioambient.errors import AmbientError import voluptuous as vol from homeassistant import config_entries @@ -40,8 +42,6 @@ class AmbientStationFlowHandler(config_entries.ConfigFlow): async def async_step_user(self, user_input=None): """Handle the start of the config flow.""" - from aioambient import Client - from aioambient.errors import AmbientError if not user_input: return await self._show_form() diff --git a/tests/components/ambient_station/test_config_flow.py b/tests/components/ambient_station/test_config_flow.py index 701a6dacb98..c94a51be94e 100644 --- a/tests/components/ambient_station/test_config_flow.py +++ b/tests/components/ambient_station/test_config_flow.py @@ -3,12 +3,13 @@ import json import aioambient import pytest +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.components.ambient_station import CONF_APP_KEY, DOMAIN, config_flow from homeassistant.const import CONF_API_KEY -from tests.common import load_fixture, MockConfigEntry, MockDependency, mock_coro +from tests.common import load_fixture, MockConfigEntry, mock_coro @pytest.fixture @@ -20,9 +21,9 @@ def get_devices_response(): @pytest.fixture def mock_aioambient(get_devices_response): """Mock the aioambient library.""" - with MockDependency("aioambient") as mock_aioambient_: - mock_aioambient_.Client().api.get_devices.return_value = get_devices_response - yield mock_aioambient_ + with patch("homeassistant.components.ambient_station.config_flow.Client") as Client: + Client().api.get_devices.return_value = get_devices_response + yield Client async def test_duplicate_error(hass):