diff --git a/script/scaffold/templates/reproduce_state/integration/reproduce_state.py b/script/scaffold/templates/reproduce_state/integration/reproduce_state.py index 19e046f4c92..4247a1dc8d2 100644 --- a/script/scaffold/templates/reproduce_state/integration/reproduce_state.py +++ b/script/scaffold/templates/reproduce_state/integration/reproduce_state.py @@ -2,8 +2,9 @@ from __future__ import annotations import asyncio +from collections.abc import Iterable import logging -from typing import Any, Iterable +from typing import Any from homeassistant.const import ( ATTR_ENTITY_ID, diff --git a/tests/common.py b/tests/common.py index 32e91768bf1..3ea4cde2cec 100644 --- a/tests/common.py +++ b/tests/common.py @@ -4,6 +4,7 @@ from __future__ import annotations import asyncio import collections from collections import OrderedDict +from collections.abc import Awaitable, Collection from contextlib import contextmanager from datetime import datetime, timedelta import functools as ft @@ -16,7 +17,7 @@ import threading import time from time import monotonic import types -from typing import Any, Awaitable, Collection +from typing import Any from unittest.mock import AsyncMock, Mock, patch from aiohttp.test_utils import unused_port as get_test_instance_port # noqa: F401 diff --git a/tests/components/amberelectric/test_binary_sensor.py b/tests/components/amberelectric/test_binary_sensor.py index 9aa4782b9a4..856dcdc473e 100644 --- a/tests/components/amberelectric/test_binary_sensor.py +++ b/tests/components/amberelectric/test_binary_sensor.py @@ -1,7 +1,7 @@ """Test the Amber Electric Sensors.""" from __future__ import annotations -from typing import AsyncGenerator +from collections.abc import AsyncGenerator from unittest.mock import Mock, patch from amberelectric.model.channel import ChannelType diff --git a/tests/components/amberelectric/test_config_flow.py b/tests/components/amberelectric/test_config_flow.py index 71c40b4cf75..ce474be1b3d 100644 --- a/tests/components/amberelectric/test_config_flow.py +++ b/tests/components/amberelectric/test_config_flow.py @@ -1,6 +1,6 @@ """Tests for the Amber config flow.""" -from typing import Generator +from collections.abc import Generator from unittest.mock import Mock, patch from amberelectric import ApiException diff --git a/tests/components/amberelectric/test_coordinator.py b/tests/components/amberelectric/test_coordinator.py index 5085f9c50f8..bc80d3674d6 100644 --- a/tests/components/amberelectric/test_coordinator.py +++ b/tests/components/amberelectric/test_coordinator.py @@ -1,7 +1,7 @@ """Tests for the Amber Electric Data Coordinator.""" from __future__ import annotations -from typing import Generator +from collections.abc import Generator from unittest.mock import Mock, patch from amberelectric import ApiException diff --git a/tests/components/amberelectric/test_sensor.py b/tests/components/amberelectric/test_sensor.py index 300b825cb7a..fa8cffe2c73 100644 --- a/tests/components/amberelectric/test_sensor.py +++ b/tests/components/amberelectric/test_sensor.py @@ -1,5 +1,5 @@ """Test the Amber Electric Sensors.""" -from typing import AsyncGenerator +from collections.abc import AsyncGenerator from unittest.mock import Mock, patch from amberelectric.model.current_interval import CurrentInterval diff --git a/tests/components/apache_kafka/test_init.py b/tests/components/apache_kafka/test_init.py index c4285a0cc65..3f594b3fce3 100644 --- a/tests/components/apache_kafka/test_init.py +++ b/tests/components/apache_kafka/test_init.py @@ -2,8 +2,8 @@ from __future__ import annotations from asyncio import AbstractEventLoop +from collections.abc import Callable from dataclasses import dataclass -from typing import Callable from unittest.mock import patch import pytest diff --git a/tests/components/crownstone/test_config_flow.py b/tests/components/crownstone/test_config_flow.py index 05fde6109e7..fdc0df108ee 100644 --- a/tests/components/crownstone/test_config_flow.py +++ b/tests/components/crownstone/test_config_flow.py @@ -1,7 +1,8 @@ """Tests for the Crownstone integration.""" from __future__ import annotations -from typing import Generator, Union +from collections.abc import Generator +from typing import Union from unittest.mock import AsyncMock, MagicMock, patch from crownstone_cloud.cloud_models.spheres import Spheres diff --git a/tests/components/flux_led/__init__.py b/tests/components/flux_led/__init__.py index 96fc0b78bfd..db4aa18a096 100644 --- a/tests/components/flux_led/__init__.py +++ b/tests/components/flux_led/__init__.py @@ -2,9 +2,9 @@ from __future__ import annotations import asyncio +from collections.abc import Callable from contextlib import contextmanager import datetime -from typing import Callable from unittest.mock import AsyncMock, MagicMock, patch from flux_led import DeviceType diff --git a/tests/components/forecast_solar/conftest.py b/tests/components/forecast_solar/conftest.py index 0be3f4bde0b..6e1adc14b7f 100644 --- a/tests/components/forecast_solar/conftest.py +++ b/tests/components/forecast_solar/conftest.py @@ -1,7 +1,7 @@ """Fixtures for Forecast.Solar integration tests.""" +from collections.abc import Generator from datetime import datetime, timedelta -from typing import Generator from unittest.mock import MagicMock, patch from forecast_solar import models diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py index 3b5aa7365dc..01bd179e2ea 100644 --- a/tests/components/google/test_calendar.py +++ b/tests/components/google/test_calendar.py @@ -2,9 +2,10 @@ from __future__ import annotations +from collections.abc import Callable import copy from http import HTTPStatus -from typing import Any, Callable +from typing import Any from unittest.mock import Mock, patch import httplib2 diff --git a/tests/components/heos/conftest.py b/tests/components/heos/conftest.py index a6b5c11dc9e..d303df2619f 100644 --- a/tests/components/heos/conftest.py +++ b/tests/components/heos/conftest.py @@ -1,7 +1,7 @@ """Configuration for HEOS tests.""" from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence from unittest.mock import Mock, patch as patch from pyheos import ( diff --git a/tests/components/hyperion/test_camera.py b/tests/components/hyperion/test_camera.py index 2ab16fb1301..71e1e42cb1a 100644 --- a/tests/components/hyperion/test_camera.py +++ b/tests/components/hyperion/test_camera.py @@ -3,8 +3,7 @@ from __future__ import annotations import asyncio import base64 -from collections.abc import Awaitable -from typing import Callable +from collections.abc import Awaitable, Callable from unittest.mock import AsyncMock, Mock, patch from aiohttp import web diff --git a/tests/components/modern_forms/__init__.py b/tests/components/modern_forms/__init__.py index c6d2a8b3637..65de87c333d 100644 --- a/tests/components/modern_forms/__init__.py +++ b/tests/components/modern_forms/__init__.py @@ -1,7 +1,7 @@ """Tests for the Modern Forms integration.""" +from collections.abc import Callable import json -from typing import Callable from aiomodernforms.const import COMMAND_QUERY_STATIC_DATA diff --git a/tests/components/mysensors/conftest.py b/tests/components/mysensors/conftest.py index 1843e495801..6dd7add37e6 100644 --- a/tests/components/mysensors/conftest.py +++ b/tests/components/mysensors/conftest.py @@ -1,9 +1,9 @@ """Provide common mysensors fixtures.""" from __future__ import annotations -from collections.abc import AsyncGenerator, Generator +from collections.abc import AsyncGenerator, Callable, Generator import json -from typing import Any, Callable +from typing import Any from unittest.mock import MagicMock, patch from mysensors.persistence import MySensorsJSONDecoder diff --git a/tests/components/mysensors/test_sensor.py b/tests/components/mysensors/test_sensor.py index 119d3c4eb42..0774d480c98 100644 --- a/tests/components/mysensors/test_sensor.py +++ b/tests/components/mysensors/test_sensor.py @@ -1,7 +1,7 @@ """Provide tests for mysensors sensor platform.""" from __future__ import annotations -from typing import Callable +from collections.abc import Callable from mysensors.sensor import Sensor import pytest diff --git a/tests/components/nest/common.py b/tests/components/nest/common.py index d725761c9d7..180821a8d9e 100644 --- a/tests/components/nest/common.py +++ b/tests/components/nest/common.py @@ -1,7 +1,7 @@ """Common libraries for test setup.""" +from collections.abc import Awaitable, Callable import time -from typing import Awaitable, Callable from unittest.mock import patch from google_nest_sdm.device_manager import DeviceManager diff --git a/tests/components/nest/test_media_source.py b/tests/components/nest/test_media_source.py index 82d8c68267e..7c9888ecac9 100644 --- a/tests/components/nest/test_media_source.py +++ b/tests/components/nest/test_media_source.py @@ -4,9 +4,9 @@ These tests simulate recent camera events received by the subscriber exposed as media in the media source. """ +from collections.abc import Generator import datetime from http import HTTPStatus -from typing import Generator from unittest.mock import patch import aiohttp diff --git a/tests/components/recorder/conftest.py b/tests/components/recorder/conftest.py index e7786307b69..b23bfee48d3 100644 --- a/tests/components/recorder/conftest.py +++ b/tests/components/recorder/conftest.py @@ -1,8 +1,8 @@ """Common test tools.""" from __future__ import annotations -from collections.abc import AsyncGenerator -from typing import Awaitable, Callable, cast +from collections.abc import AsyncGenerator, Awaitable, Callable +from typing import cast from unittest.mock import patch import pytest diff --git a/tests/components/rtsp_to_webrtc/test_init.py b/tests/components/rtsp_to_webrtc/test_init.py index fcd7cfbe806..0a385ed7b92 100644 --- a/tests/components/rtsp_to_webrtc/test_init.py +++ b/tests/components/rtsp_to_webrtc/test_init.py @@ -3,7 +3,8 @@ from __future__ import annotations import base64 -from typing import Any, AsyncGenerator, Awaitable, Callable +from collections.abc import AsyncGenerator, Awaitable, Callable +from typing import Any from unittest.mock import patch import aiohttp diff --git a/tests/components/script/test_blueprint.py b/tests/components/script/test_blueprint.py index 1c02a35792b..10e73a80939 100644 --- a/tests/components/script/test_blueprint.py +++ b/tests/components/script/test_blueprint.py @@ -1,8 +1,8 @@ """Test script blueprints.""" import asyncio +from collections.abc import Iterator import contextlib import pathlib -from typing import Iterator from unittest.mock import patch from homeassistant.components import script diff --git a/tests/components/sharkiq/test_vacuum.py b/tests/components/sharkiq/test_vacuum.py index b36359ed31a..5080c379108 100644 --- a/tests/components/sharkiq/test_vacuum.py +++ b/tests/components/sharkiq/test_vacuum.py @@ -1,9 +1,10 @@ """Test the Shark IQ vacuum entity.""" from __future__ import annotations +from collections.abc import Iterable from copy import deepcopy import enum -from typing import Any, Iterable +from typing import Any from unittest.mock import patch import pytest diff --git a/tests/components/statistics/test_sensor.py b/tests/components/statistics/test_sensor.py index 27a5bc91bf8..e2e6c7dfd5d 100644 --- a/tests/components/statistics/test_sensor.py +++ b/tests/components/statistics/test_sensor.py @@ -1,9 +1,10 @@ """The test for the statistics sensor platform.""" from __future__ import annotations +from collections.abc import Sequence from datetime import datetime, timedelta import statistics -from typing import Any, Sequence +from typing import Any from unittest.mock import patch from homeassistant import config as hass_config diff --git a/tests/components/unifiprotect/conftest.py b/tests/components/unifiprotect/conftest.py index e5b00228e13..75d07a4c19f 100644 --- a/tests/components/unifiprotect/conftest.py +++ b/tests/components/unifiprotect/conftest.py @@ -2,11 +2,12 @@ # pylint: disable=protected-access from __future__ import annotations +from collections.abc import Callable from dataclasses import dataclass from datetime import timedelta from ipaddress import IPv4Address import json -from typing import Any, Callable +from typing import Any from unittest.mock import AsyncMock, Mock, patch import pytest diff --git a/tests/components/upnp/conftest.py b/tests/components/upnp/conftest.py index f7a42551c34..479cd900050 100644 --- a/tests/components/upnp/conftest.py +++ b/tests/components/upnp/conftest.py @@ -1,7 +1,7 @@ """Configuration for SSDP tests.""" from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence from unittest.mock import AsyncMock, MagicMock, patch from urllib.parse import urlparse diff --git a/tests/components/vera/common.py b/tests/components/vera/common.py index 1ce55ac9e8f..6212b68fd42 100644 --- a/tests/components/vera/common.py +++ b/tests/components/vera/common.py @@ -1,8 +1,9 @@ """Common code for tests.""" from __future__ import annotations +from collections.abc import Callable from enum import Enum -from typing import Callable, NamedTuple +from typing import NamedTuple from unittest.mock import MagicMock import pyvera as pv diff --git a/tests/components/vera/test_sensor.py b/tests/components/vera/test_sensor.py index a2086f9f5e0..6f6e62e00a2 100644 --- a/tests/components/vera/test_sensor.py +++ b/tests/components/vera/test_sensor.py @@ -1,7 +1,8 @@ """Vera tests.""" from __future__ import annotations -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from unittest.mock import MagicMock import pyvera as pv diff --git a/tests/components/wled/conftest.py b/tests/components/wled/conftest.py index 595ab3e978d..f89d92aaa16 100644 --- a/tests/components/wled/conftest.py +++ b/tests/components/wled/conftest.py @@ -1,6 +1,6 @@ """Fixtures for WLED integration tests.""" +from collections.abc import Generator import json -from typing import Generator from unittest.mock import MagicMock, patch import pytest diff --git a/tests/components/wled/test_coordinator.py b/tests/components/wled/test_coordinator.py index 47190604238..a7d7929c84e 100644 --- a/tests/components/wled/test_coordinator.py +++ b/tests/components/wled/test_coordinator.py @@ -1,7 +1,7 @@ """Tests for the coordinator of the WLED integration.""" import asyncio +from collections.abc import Callable from copy import deepcopy -from typing import Callable from unittest.mock import MagicMock import pytest diff --git a/tests/components/wled/test_init.py b/tests/components/wled/test_init.py index 01821262389..3186cf1e7e4 100644 --- a/tests/components/wled/test_init.py +++ b/tests/components/wled/test_init.py @@ -1,6 +1,6 @@ """Tests for the WLED integration.""" import asyncio -from typing import Callable +from collections.abc import Callable from unittest.mock import AsyncMock, MagicMock, patch import pytest