From f24b3509a7d18d3e40e77957a602d8c8b7082c22 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 10 Jan 2022 22:54:35 +0100 Subject: [PATCH] Remove deprecated async_get_scanner from netgear (#63862) --- .../components/netgear/device_tracker.py | 26 +++---------------- tests/components/netgear/conftest.py | 14 ---------- 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 tests/components/netgear/conftest.py diff --git a/homeassistant/components/netgear/device_tracker.py b/homeassistant/components/netgear/device_tracker.py index 7d7b278f937..a391500cce1 100644 --- a/homeassistant/components/netgear/device_tracker.py +++ b/homeassistant/components/netgear/device_tracker.py @@ -1,15 +1,16 @@ """Support for Netgear routers.""" +from __future__ import annotations + import logging import voluptuous as vol from homeassistant.components.device_tracker import ( - DOMAIN as DEVICE_TRACKER_DOMAIN, PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, SOURCE_TYPE_ROUTER, ) from homeassistant.components.device_tracker.config_entry import ScannerEntity -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry +from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_DEVICES, CONF_EXCLUDE, @@ -23,7 +24,7 @@ from homeassistant.core import HomeAssistant, callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity_platform import AddEntitiesCallback -from .const import DEVICE_ICONS, DOMAIN +from .const import DEVICE_ICONS from .router import NetgearDeviceEntity, NetgearRouter, async_setup_netgear_entry _LOGGER = logging.getLogger(__name__) @@ -44,25 +45,6 @@ PLATFORM_SCHEMA = PARENT_PLATFORM_SCHEMA.extend( ) -async def async_get_scanner(hass, config): - """Import Netgear configuration from YAML.""" - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, - context={"source": SOURCE_IMPORT}, - data=config[DEVICE_TRACKER_DOMAIN], - ) - ) - - _LOGGER.warning( - "Your Netgear configuration has been imported into the UI, " - "please remove it from configuration.yaml. " - "Loading Netgear via platform setup is now deprecated" - ) - - return None - - async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: diff --git a/tests/components/netgear/conftest.py b/tests/components/netgear/conftest.py deleted file mode 100644 index f60b9be62a5..00000000000 --- a/tests/components/netgear/conftest.py +++ /dev/null @@ -1,14 +0,0 @@ -"""Configure Netgear tests.""" -from unittest.mock import patch - -import pytest - - -@pytest.fixture(name="bypass_setup", autouse=True) -def bypass_setup_fixture(): - """Mock component setup.""" - with patch( - "homeassistant.components.netgear.device_tracker.async_get_scanner", - return_value=None, - ): - yield