Import Generator from collections.abc (1) (#120914)

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,

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,

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:

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

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,

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(

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

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

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 (

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

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

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 (

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

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

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

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

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,

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,

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,

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

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

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,

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

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

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:

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

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

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 (

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
 

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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