diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py index 047e981ab0d..44dfae33e18 100644 --- a/homeassistant/components/alexa/capabilities.py +++ b/homeassistant/components/alexa/capabilities.py @@ -2,11 +2,10 @@ from __future__ import annotations +from collections.abc import Generator import logging from typing import Any -from typing_extensions import Generator - from homeassistant.components import ( button, climate, diff --git a/homeassistant/components/alexa/entities.py b/homeassistant/components/alexa/entities.py index 8d45ac3a11b..d3e9f2a8e7d 100644 --- a/homeassistant/components/alexa/entities.py +++ b/homeassistant/components/alexa/entities.py @@ -2,12 +2,10 @@ from __future__ import annotations -from collections.abc import Iterable +from collections.abc import Generator, Iterable import logging from typing import TYPE_CHECKING, Any -from typing_extensions import Generator - from homeassistant.components import ( alarm_control_panel, alert, diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py index 068afe53b49..339417c253a 100644 --- a/homeassistant/components/assist_pipeline/pipeline.py +++ b/homeassistant/components/assist_pipeline/pipeline.py @@ -5,7 +5,7 @@ from __future__ import annotations import array import asyncio from collections import defaultdict, deque -from collections.abc import AsyncIterable, Callable, Iterable +from collections.abc import AsyncGenerator, AsyncIterable, Callable, Iterable from dataclasses import asdict, dataclass, field from enum import StrEnum import logging @@ -16,7 +16,6 @@ import time from typing import TYPE_CHECKING, Any, Final, Literal, cast import wave -from typing_extensions import AsyncGenerator import voluptuous as vol if TYPE_CHECKING: diff --git a/homeassistant/components/assist_pipeline/websocket_api.py b/homeassistant/components/assist_pipeline/websocket_api.py index 18464810525..7dea960d940 100644 --- a/homeassistant/components/assist_pipeline/websocket_api.py +++ b/homeassistant/components/assist_pipeline/websocket_api.py @@ -5,13 +5,12 @@ import asyncio # Suppressing disable=deprecated-module is needed for Python 3.11 import audioop # pylint: disable=deprecated-module import base64 -from collections.abc import Callable +from collections.abc import AsyncGenerator, Callable import contextlib import logging import math from typing import Any, Final -from typing_extensions import AsyncGenerator import voluptuous as vol from homeassistant.components import conversation, stt, tts, websocket_api diff --git a/homeassistant/components/automation/trace.py b/homeassistant/components/automation/trace.py index 08f42167ceb..ed30b0d348b 100644 --- a/homeassistant/components/automation/trace.py +++ b/homeassistant/components/automation/trace.py @@ -2,11 +2,10 @@ from __future__ import annotations +from collections.abc import Generator from contextlib import contextmanager from typing import Any -from typing_extensions import Generator - from homeassistant.components.trace import ( CONF_STORED_TRACES, ActionTrace, diff --git a/homeassistant/components/bluetooth/passive_update_coordinator.py b/homeassistant/components/bluetooth/passive_update_coordinator.py index 524faad510b..df06a7c534b 100644 --- a/homeassistant/components/bluetooth/passive_update_coordinator.py +++ b/homeassistant/components/bluetooth/passive_update_coordinator.py @@ -15,11 +15,9 @@ from homeassistant.helpers.update_coordinator import ( from .update_coordinator import BasePassiveBluetoothCoordinator if TYPE_CHECKING: - from collections.abc import Callable + from collections.abc import Callable, Generator import logging - from typing_extensions import Generator - from . import BluetoothChange, BluetoothScanningMode, BluetoothServiceInfoBleak _PassiveBluetoothDataUpdateCoordinatorT = TypeVar( diff --git a/homeassistant/components/homekit/aidmanager.py b/homeassistant/components/homekit/aidmanager.py index 8049c4fd5e2..f755f6f901f 100644 --- a/homeassistant/components/homekit/aidmanager.py +++ b/homeassistant/components/homekit/aidmanager.py @@ -11,10 +11,10 @@ This module generates and stores them in a HA storage. from __future__ import annotations +from collections.abc import Generator import random from fnv_hash_fast import fnv1a_32 -from typing_extensions import Generator from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry as er diff --git a/homeassistant/components/homekit_controller/device_trigger.py b/homeassistant/components/homekit_controller/device_trigger.py index 631ba43116a..6195e61af3f 100644 --- a/homeassistant/components/homekit_controller/device_trigger.py +++ b/homeassistant/components/homekit_controller/device_trigger.py @@ -2,14 +2,13 @@ from __future__ import annotations -from collections.abc import Callable +from collections.abc import Callable, Generator from typing import TYPE_CHECKING, Any from aiohomekit.model.characteristics import CharacteristicsTypes from aiohomekit.model.characteristics.const import InputEventValues from aiohomekit.model.services import Service, ServicesTypes from aiohomekit.utils import clamp_enum_to_char -from typing_extensions import Generator import voluptuous as vol from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA diff --git a/homeassistant/components/knx/config_flow.py b/homeassistant/components/knx/config_flow.py index 226abc1b868..7d6443bd9ef 100644 --- a/homeassistant/components/knx/config_flow.py +++ b/homeassistant/components/knx/config_flow.py @@ -3,9 +3,9 @@ from __future__ import annotations from abc import ABC, abstractmethod +from collections.abc import AsyncGenerator from typing import Any, Final -from typing_extensions import AsyncGenerator import voluptuous as vol from xknx import XKNX from xknx.exceptions.exception import ( diff --git a/homeassistant/components/logbook/processor.py b/homeassistant/components/logbook/processor.py index 4e245189154..ed9888f83d0 100644 --- a/homeassistant/components/logbook/processor.py +++ b/homeassistant/components/logbook/processor.py @@ -2,7 +2,7 @@ from __future__ import annotations -from collections.abc import Callable, Sequence +from collections.abc import Callable, Generator, Sequence from contextlib import suppress from dataclasses import dataclass from datetime import datetime as dt @@ -11,7 +11,6 @@ from typing import Any from sqlalchemy.engine import Result from sqlalchemy.engine.row import Row -from typing_extensions import Generator from homeassistant.components.recorder import get_instance from homeassistant.components.recorder.filters import Filters diff --git a/homeassistant/components/matter/discovery.py b/homeassistant/components/matter/discovery.py index b457be8583c..510b77c24c7 100644 --- a/homeassistant/components/matter/discovery.py +++ b/homeassistant/components/matter/discovery.py @@ -2,9 +2,10 @@ from __future__ import annotations +from collections.abc import Generator + from chip.clusters.Objects import ClusterAttributeDescriptor from matter_server.client.models.node import MatterEndpoint -from typing_extensions import Generator from homeassistant.const import Platform from homeassistant.core import callback diff --git a/homeassistant/components/mqtt/client.py b/homeassistant/components/mqtt/client.py index f65769badfa..2ebd105b432 100644 --- a/homeassistant/components/mqtt/client.py +++ b/homeassistant/components/mqtt/client.py @@ -4,7 +4,7 @@ from __future__ import annotations import asyncio from collections import defaultdict -from collections.abc import Callable, Coroutine, Iterable +from collections.abc import AsyncGenerator, Callable, Coroutine, Iterable import contextlib from dataclasses import dataclass from functools import lru_cache, partial @@ -18,7 +18,6 @@ from typing import TYPE_CHECKING, Any import uuid import certifi -from typing_extensions import AsyncGenerator from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( diff --git a/homeassistant/components/profiler/__init__.py b/homeassistant/components/profiler/__init__.py index b9b833647df..9b2b9736574 100644 --- a/homeassistant/components/profiler/__init__.py +++ b/homeassistant/components/profiler/__init__.py @@ -1,6 +1,7 @@ """The profiler integration.""" import asyncio +from collections.abc import Generator import contextlib from contextlib import suppress from datetime import timedelta @@ -14,7 +15,6 @@ import traceback from typing import Any, cast from lru import LRU -from typing_extensions import Generator import voluptuous as vol from homeassistant.components import persistent_notification diff --git a/homeassistant/components/recorder/util.py b/homeassistant/components/recorder/util.py index b4ee90a8323..89621821ff8 100644 --- a/homeassistant/components/recorder/util.py +++ b/homeassistant/components/recorder/util.py @@ -2,7 +2,7 @@ from __future__ import annotations -from collections.abc import Callable, Sequence +from collections.abc import Callable, Generator, Sequence import contextlib from contextlib import contextmanager from datetime import date, datetime, timedelta @@ -25,7 +25,6 @@ from sqlalchemy.exc import OperationalError, SQLAlchemyError, StatementError from sqlalchemy.orm.query import Query from sqlalchemy.orm.session import Session from sqlalchemy.sql.lambdas import StatementLambdaElement -from typing_extensions import Generator import voluptuous as vol from homeassistant.core import HomeAssistant, callback diff --git a/homeassistant/components/stream/fmp4utils.py b/homeassistant/components/stream/fmp4utils.py index e0e3a8ba009..255d75e3b79 100644 --- a/homeassistant/components/stream/fmp4utils.py +++ b/homeassistant/components/stream/fmp4utils.py @@ -2,10 +2,9 @@ from __future__ import annotations +from collections.abc import Generator from typing import TYPE_CHECKING -from typing_extensions import Generator - from homeassistant.exceptions import HomeAssistantError from .core import Orientation diff --git a/homeassistant/components/stream/worker.py b/homeassistant/components/stream/worker.py index 4fd9b27d02f..f51a3f98b01 100644 --- a/homeassistant/components/stream/worker.py +++ b/homeassistant/components/stream/worker.py @@ -3,7 +3,7 @@ from __future__ import annotations from collections import defaultdict, deque -from collections.abc import Callable, Iterator, Mapping +from collections.abc import Callable, Generator, Iterator, Mapping import contextlib from dataclasses import fields import datetime @@ -13,7 +13,6 @@ from threading import Event from typing import Any, Self, cast import av -from typing_extensions import Generator from homeassistant.core import HomeAssistant from homeassistant.util import dt as dt_util diff --git a/homeassistant/components/unifiprotect/camera.py b/homeassistant/components/unifiprotect/camera.py index 2a97aa26823..73cdb4a2c31 100644 --- a/homeassistant/components/unifiprotect/camera.py +++ b/homeassistant/components/unifiprotect/camera.py @@ -2,9 +2,9 @@ from __future__ import annotations +from collections.abc import Generator import logging -from typing_extensions import Generator from uiprotect.data import ( Camera as UFPCamera, CameraChannel, diff --git a/homeassistant/components/unifiprotect/data.py b/homeassistant/components/unifiprotect/data.py index a2ef72c7008..b8e47e0e0f1 100644 --- a/homeassistant/components/unifiprotect/data.py +++ b/homeassistant/components/unifiprotect/data.py @@ -3,13 +3,12 @@ from __future__ import annotations from collections import defaultdict -from collections.abc import Callable, Iterable +from collections.abc import Callable, Generator, Iterable from datetime import datetime, timedelta from functools import partial import logging from typing import TYPE_CHECKING, Any, cast -from typing_extensions import Generator from uiprotect import ProtectApiClient from uiprotect.data import ( NVR, diff --git a/homeassistant/components/unifiprotect/utils.py b/homeassistant/components/unifiprotect/utils.py index d98ad72e1d1..61314346d32 100644 --- a/homeassistant/components/unifiprotect/utils.py +++ b/homeassistant/components/unifiprotect/utils.py @@ -2,14 +2,13 @@ from __future__ import annotations -from collections.abc import Iterable +from collections.abc import Generator, Iterable import contextlib from pathlib import Path import socket from typing import TYPE_CHECKING from aiohttp import CookieJar -from typing_extensions import Generator from uiprotect import ProtectApiClient from uiprotect.data import ( Bootstrap, diff --git a/homeassistant/components/wemo/entity.py b/homeassistant/components/wemo/entity.py index db64aa3137e..16ab3ae1173 100644 --- a/homeassistant/components/wemo/entity.py +++ b/homeassistant/components/wemo/entity.py @@ -2,11 +2,11 @@ from __future__ import annotations +from collections.abc import Generator import contextlib import logging from pywemo.exceptions import ActionException -from typing_extensions import Generator from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.update_coordinator import CoordinatorEntity diff --git a/homeassistant/components/wyoming/satellite.py b/homeassistant/components/wyoming/satellite.py index 5af0c54abad..3ca86a42e5d 100644 --- a/homeassistant/components/wyoming/satellite.py +++ b/homeassistant/components/wyoming/satellite.py @@ -1,6 +1,7 @@ """Support for Wyoming satellite services.""" import asyncio +from collections.abc import AsyncGenerator import io import logging import time @@ -8,7 +9,6 @@ from typing import Final from uuid import uuid4 import wave -from typing_extensions import AsyncGenerator from wyoming.asr import Transcribe, Transcript from wyoming.audio import AudioChunk, AudioChunkConverter, AudioStart, AudioStop from wyoming.client import AsyncTcpClient diff --git a/homeassistant/components/zwave_js/discovery.py b/homeassistant/components/zwave_js/discovery.py index 0b66567c036..c3a2884cb7a 100644 --- a/homeassistant/components/zwave_js/discovery.py +++ b/homeassistant/components/zwave_js/discovery.py @@ -2,12 +2,12 @@ from __future__ import annotations +from collections.abc import Generator from dataclasses import asdict, dataclass, field from enum import StrEnum from typing import TYPE_CHECKING, Any, cast from awesomeversion import AwesomeVersion -from typing_extensions import Generator from zwave_js_server.const import ( CURRENT_STATE_PROPERTY, CURRENT_VALUE_PROPERTY, diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py index 66d09714723..e5c0bd64781 100644 --- a/homeassistant/components/zwave_js/services.py +++ b/homeassistant/components/zwave_js/services.py @@ -3,12 +3,11 @@ from __future__ import annotations import asyncio -from collections.abc import Collection, Sequence +from collections.abc import Collection, Generator, Sequence import logging import math from typing import Any -from typing_extensions import Generator import voluptuous as vol from zwave_js_server.client import Client as ZwaveClient from zwave_js_server.const import SET_VALUE_SUCCESS, CommandClass, CommandStatus diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py index c8d671e1fe1..bf3d8fa8f03 100644 --- a/homeassistant/config_entries.py +++ b/homeassistant/config_entries.py @@ -4,7 +4,15 @@ from __future__ import annotations import asyncio from collections import UserDict -from collections.abc import Callable, Coroutine, Hashable, Iterable, Mapping, ValuesView +from collections.abc import ( + Callable, + Coroutine, + Generator, + Hashable, + Iterable, + Mapping, + ValuesView, +) from contextvars import ContextVar from copy import deepcopy from enum import Enum, StrEnum @@ -16,7 +24,7 @@ from types import MappingProxyType from typing import TYPE_CHECKING, Any, Generic, Self, cast from async_interrupt import interrupt -from typing_extensions import Generator, TypeVar +from typing_extensions import TypeVar from . import data_entry_flow, loader from .components import persistent_notification diff --git a/homeassistant/exceptions.py b/homeassistant/exceptions.py index 01e22d16e79..f308cbc5cd8 100644 --- a/homeassistant/exceptions.py +++ b/homeassistant/exceptions.py @@ -2,12 +2,10 @@ from __future__ import annotations -from collections.abc import Callable, Sequence +from collections.abc import Callable, Generator, Sequence from dataclasses import dataclass from typing import TYPE_CHECKING, Any -from typing_extensions import Generator - from .util.event_type import EventType if TYPE_CHECKING: diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py index e15b40a78df..3438336dbfa 100644 --- a/homeassistant/helpers/condition.py +++ b/homeassistant/helpers/condition.py @@ -4,7 +4,7 @@ from __future__ import annotations import asyncio from collections import deque -from collections.abc import Callable, Container +from collections.abc import Callable, Container, Generator from contextlib import contextmanager from datetime import datetime, time as dt_time, timedelta import functools as ft @@ -12,7 +12,6 @@ import re import sys from typing import Any, Protocol, cast -from typing_extensions import Generator import voluptuous as vol from homeassistant.components import zone as zone_cmp diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py index 84dabb114cd..081641ef6c2 100644 --- a/homeassistant/helpers/script.py +++ b/homeassistant/helpers/script.py @@ -3,7 +3,7 @@ from __future__ import annotations import asyncio -from collections.abc import Callable, Mapping, Sequence +from collections.abc import AsyncGenerator, Callable, Mapping, Sequence from contextlib import asynccontextmanager from contextvars import ContextVar from copy import copy @@ -16,7 +16,6 @@ from types import MappingProxyType from typing import Any, Literal, TypedDict, cast import async_interrupt -from typing_extensions import AsyncGenerator import voluptuous as vol from homeassistant import exceptions diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py index cc619e25aed..9ab3f353dea 100644 --- a/homeassistant/helpers/template.py +++ b/homeassistant/helpers/template.py @@ -6,7 +6,7 @@ from ast import literal_eval import asyncio import base64 import collections.abc -from collections.abc import Callable, Iterable +from collections.abc import Callable, Generator, Iterable from contextlib import AbstractContextManager from contextvars import ContextVar from datetime import date, datetime, time, timedelta @@ -34,7 +34,6 @@ from jinja2.sandbox import ImmutableSandboxedEnvironment from jinja2.utils import Namespace from lru import LRU import orjson -from typing_extensions import Generator import voluptuous as vol from homeassistant.const import ( diff --git a/homeassistant/helpers/trace.py b/homeassistant/helpers/trace.py index 6f29ff23bec..a36939a0f60 100644 --- a/homeassistant/helpers/trace.py +++ b/homeassistant/helpers/trace.py @@ -3,14 +3,12 @@ from __future__ import annotations from collections import deque -from collections.abc import Callable, Coroutine +from collections.abc import Callable, Coroutine, Generator from contextlib import contextmanager from contextvars import ContextVar from functools import wraps from typing import Any -from typing_extensions import Generator - from homeassistant.core import ServiceResponse import homeassistant.util.dt as dt_util diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py index 8451c69d2b3..c15dbb2d853 100644 --- a/homeassistant/helpers/update_coordinator.py +++ b/homeassistant/helpers/update_coordinator.py @@ -4,7 +4,7 @@ from __future__ import annotations from abc import abstractmethod import asyncio -from collections.abc import Awaitable, Callable, Coroutine +from collections.abc import Awaitable, Callable, Coroutine, Generator from datetime import datetime, timedelta import logging from random import randint @@ -14,7 +14,7 @@ import urllib.error import aiohttp import requests -from typing_extensions import Generator, TypeVar +from typing_extensions import TypeVar from homeassistant import config_entries from homeassistant.const import EVENT_HOMEASSISTANT_STOP diff --git a/homeassistant/setup.py b/homeassistant/setup.py index 9775a3fee45..3b512e92686 100644 --- a/homeassistant/setup.py +++ b/homeassistant/setup.py @@ -4,7 +4,7 @@ from __future__ import annotations import asyncio from collections import defaultdict -from collections.abc import Awaitable, Callable, Mapping +from collections.abc import Awaitable, Callable, Generator, Mapping import contextlib import contextvars from enum import StrEnum @@ -14,8 +14,6 @@ import time from types import ModuleType from typing import Any, Final, TypedDict -from typing_extensions import Generator - from . import config as conf_util, core, loader, requirements from .const import ( BASE_PLATFORMS, # noqa: F401 diff --git a/script/scaffold/templates/config_flow/tests/conftest.py b/script/scaffold/templates/config_flow/tests/conftest.py index fc217636705..12faacd40df 100644 --- a/script/scaffold/templates/config_flow/tests/conftest.py +++ b/script/scaffold/templates/config_flow/tests/conftest.py @@ -1,9 +1,9 @@ """Common fixtures for the NEW_NAME tests.""" +from collections.abc import Generator from unittest.mock import AsyncMock, patch import pytest -from typing_extensions import Generator @pytest.fixture diff --git a/script/scaffold/templates/config_flow_helper/tests/conftest.py b/script/scaffold/templates/config_flow_helper/tests/conftest.py index fc217636705..12faacd40df 100644 --- a/script/scaffold/templates/config_flow_helper/tests/conftest.py +++ b/script/scaffold/templates/config_flow_helper/tests/conftest.py @@ -1,9 +1,9 @@ """Common fixtures for the NEW_NAME tests.""" +from collections.abc import Generator from unittest.mock import AsyncMock, patch import pytest -from typing_extensions import Generator @pytest.fixture diff --git a/tests/common.py b/tests/common.py index 52ea4861c81..40745a1df9e 100644 --- a/tests/common.py +++ b/tests/common.py @@ -3,7 +3,14 @@ from __future__ import annotations import asyncio -from collections.abc import Callable, Coroutine, Mapping, Sequence +from collections.abc import ( + AsyncGenerator, + Callable, + Coroutine, + Generator, + Mapping, + Sequence, +) from contextlib import asynccontextmanager, contextmanager from datetime import UTC, datetime, timedelta from enum import Enum @@ -23,7 +30,6 @@ from unittest.mock import AsyncMock, Mock, patch from aiohttp.test_utils import unused_port as get_test_instance_port # noqa: F401 import pytest from syrupy import SnapshotAssertion -from typing_extensions import AsyncGenerator, Generator import voluptuous as vol from homeassistant import auth, bootstrap, config_entries, loader diff --git a/tests/components/conftest.py b/tests/components/conftest.py index 42746525a0d..1fe933dbe12 100644 --- a/tests/components/conftest.py +++ b/tests/components/conftest.py @@ -2,13 +2,12 @@ from __future__ import annotations -from collections.abc import Callable +from collections.abc import Callable, Generator from pathlib import Path from typing import TYPE_CHECKING, Any from unittest.mock import MagicMock, patch import pytest -from typing_extensions import Generator from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.core import HomeAssistant diff --git a/tests/conftest.py b/tests/conftest.py index 6f85a7da06e..f9b65c5f138 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,7 @@ from __future__ import annotations import asyncio -from collections.abc import Callable, Coroutine +from collections.abc import AsyncGenerator, Callable, Coroutine, Generator from contextlib import asynccontextmanager, contextmanager import datetime import functools @@ -34,7 +34,6 @@ import pytest import pytest_socket import requests_mock from syrupy.assertion import SnapshotAssertion -from typing_extensions import AsyncGenerator, Generator from homeassistant import block_async_io diff --git a/tests/helpers/test_config_entry_flow.py b/tests/helpers/test_config_entry_flow.py index 6a198b7a297..498e57d45a4 100644 --- a/tests/helpers/test_config_entry_flow.py +++ b/tests/helpers/test_config_entry_flow.py @@ -1,9 +1,9 @@ """Tests for the Config Entry Flow helper.""" +from collections.abc import Generator from unittest.mock import Mock, PropertyMock, patch import pytest -from typing_extensions import Generator from homeassistant import config_entries, data_entry_flow, setup from homeassistant.config import async_process_ha_core_config diff --git a/tests/helpers/test_config_entry_oauth2_flow.py b/tests/helpers/test_config_entry_oauth2_flow.py index 132a0b41707..23919f3a6a3 100644 --- a/tests/helpers/test_config_entry_oauth2_flow.py +++ b/tests/helpers/test_config_entry_oauth2_flow.py @@ -1,5 +1,6 @@ """Tests for the Somfy config flow.""" +from collections.abc import Generator from http import HTTPStatus import logging import time @@ -8,7 +9,6 @@ from unittest.mock import patch import aiohttp import pytest -from typing_extensions import Generator from homeassistant import config_entries, data_entry_flow, setup from homeassistant.core import HomeAssistant diff --git a/tests/helpers/test_discovery_flow.py b/tests/helpers/test_discovery_flow.py index 9c2249ac17f..c834f60e91e 100644 --- a/tests/helpers/test_discovery_flow.py +++ b/tests/helpers/test_discovery_flow.py @@ -1,9 +1,9 @@ """Test the discovery flow helper.""" +from collections.abc import Generator from unittest.mock import AsyncMock, call, patch import pytest -from typing_extensions import Generator from homeassistant import config_entries from homeassistant.core import EVENT_HOMEASSISTANT_STARTED, CoreState, HomeAssistant diff --git a/tests/scripts/test_auth.py b/tests/scripts/test_auth.py index 19a9277a36a..002807f08a5 100644 --- a/tests/scripts/test_auth.py +++ b/tests/scripts/test_auth.py @@ -1,12 +1,12 @@ """Test the auth script to manage local users.""" from asyncio import AbstractEventLoop +from collections.abc import Generator import logging from typing import Any from unittest.mock import Mock, patch import pytest -from typing_extensions import Generator from homeassistant.auth.providers import homeassistant as hass_auth from homeassistant.core import HomeAssistant diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py index ca864006852..7f3793e99e2 100644 --- a/tests/test_bootstrap.py +++ b/tests/test_bootstrap.py @@ -1,7 +1,7 @@ """Test the bootstrapping.""" import asyncio -from collections.abc import Iterable +from collections.abc import Generator, Iterable import contextlib import glob import logging @@ -11,7 +11,6 @@ from typing import Any from unittest.mock import AsyncMock, Mock, patch import pytest -from typing_extensions import Generator from homeassistant import bootstrap, loader, runner import homeassistant.config as config_util diff --git a/tests/test_config.py b/tests/test_config.py index 748255fb205..ae6cbb3ba5e 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -2,6 +2,7 @@ import asyncio from collections import OrderedDict +from collections.abc import Generator import contextlib import copy import logging @@ -12,7 +13,6 @@ from unittest.mock import AsyncMock, MagicMock, Mock, patch import pytest from syrupy.assertion import SnapshotAssertion -from typing_extensions import Generator import voluptuous as vol from voluptuous import Invalid, MultipleInvalid import yaml diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py index cba7ad8f215..b1c3915f983 100644 --- a/tests/test_config_entries.py +++ b/tests/test_config_entries.py @@ -3,6 +3,7 @@ from __future__ import annotations import asyncio +from collections.abc import Generator from datetime import timedelta from functools import cached_property import logging @@ -12,7 +13,6 @@ from unittest.mock import ANY, AsyncMock, Mock, patch from freezegun.api import FrozenDateTimeFactory import pytest from syrupy.assertion import SnapshotAssertion -from typing_extensions import Generator from homeassistant import config_entries, data_entry_flow, loader from homeassistant.components import dhcp diff --git a/tests/util/yaml/test_init.py b/tests/util/yaml/test_init.py index 6ea3f1437af..d94de23088b 100644 --- a/tests/util/yaml/test_init.py +++ b/tests/util/yaml/test_init.py @@ -1,5 +1,6 @@ """Test Home Assistant yaml loader.""" +from collections.abc import Generator import importlib import io import os @@ -9,7 +10,6 @@ import unittest from unittest.mock import Mock, patch import pytest -from typing_extensions import Generator import voluptuous as vol import yaml as pyyaml