From 67c35652f0d49dc56e1e934fab3b2c51f5f82592 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Wed, 12 Jan 2022 09:04:37 +0100
Subject: [PATCH] Update typing - collections.abc (2) (#63934)

---
 homeassistant/components/automation/__init__.py          | 3 ++-
 homeassistant/components/camera/__init__.py              | 4 ++--
 homeassistant/components/dlna_dmr/config_flow.py         | 4 ++--
 homeassistant/components/energy/types.py                 | 3 ++-
 homeassistant/components/energy/websocket_api.py         | 3 ++-
 homeassistant/components/esphome/__init__.py             | 3 ++-
 homeassistant/components/mqtt/__init__.py                | 3 ++-
 homeassistant/components/mqtt/models.py                  | 3 ++-
 homeassistant/components/pvpc_hourly_pricing/__init__.py | 2 +-
 homeassistant/components/ssdp/__init__.py                | 4 ++--
 homeassistant/components/tasmota/discovery.py            | 2 +-
 homeassistant/components/websocket_api/const.py          | 5 +++--
 12 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index b033ccaa1bd..a8d009ac2bb 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -1,8 +1,9 @@
 """Allow to set up simple automation rules via the config file."""
 from __future__ import annotations
 
+from collections.abc import Awaitable, Callable
 import logging
-from typing import Any, Awaitable, Callable, TypedDict, cast
+from typing import Any, TypedDict, cast
 
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 62389861ec3..6fdf8297ada 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 import asyncio
 import base64
 import collections
-from collections.abc import Iterable, Mapping
+from collections.abc import Awaitable, Callable, Iterable, Mapping
 from contextlib import suppress
 from dataclasses import dataclass
 from datetime import datetime, timedelta
@@ -14,7 +14,7 @@ import inspect
 import logging
 import os
 from random import SystemRandom
-from typing import Awaitable, Callable, Final, Optional, cast, final
+from typing import Final, Optional, cast, final
 
 from aiohttp import web
 import async_timeout
diff --git a/homeassistant/components/dlna_dmr/config_flow.py b/homeassistant/components/dlna_dmr/config_flow.py
index f544aba6f7d..e8999c3ebb6 100644
--- a/homeassistant/components/dlna_dmr/config_flow.py
+++ b/homeassistant/components/dlna_dmr/config_flow.py
@@ -1,10 +1,10 @@
 """Config flow for DLNA DMR."""
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 import logging
 from pprint import pformat
-from typing import Any, Mapping, Optional, cast
+from typing import Any, Optional, cast
 from urllib.parse import urlparse
 
 from async_upnp_client.client import UpnpError
diff --git a/homeassistant/components/energy/types.py b/homeassistant/components/energy/types.py
index b8df1b19bef..9a599cb9a59 100644
--- a/homeassistant/components/energy/types.py
+++ b/homeassistant/components/energy/types.py
@@ -1,7 +1,8 @@
 """Types for the energy platform."""
 from __future__ import annotations
 
-from typing import Awaitable, Callable, TypedDict
+from collections.abc import Awaitable, Callable
+from typing import TypedDict
 
 from homeassistant.core import HomeAssistant
 
diff --git a/homeassistant/components/energy/websocket_api.py b/homeassistant/components/energy/websocket_api.py
index cdc7599b55b..3d47d6e894b 100644
--- a/homeassistant/components/energy/websocket_api.py
+++ b/homeassistant/components/energy/websocket_api.py
@@ -3,11 +3,12 @@ from __future__ import annotations
 
 import asyncio
 from collections import defaultdict
+from collections.abc import Awaitable, Callable
 from datetime import datetime, timedelta
 import functools
 from itertools import chain
 from types import ModuleType
-from typing import Any, Awaitable, Callable, cast
+from typing import Any, cast
 
 import voluptuous as vol
 
diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index 4e2e7c02aaa..fd9edba9948 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -1,11 +1,12 @@
 """Support for esphome devices."""
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass, field
 import functools
 import logging
 import math
-from typing import Any, Callable, Generic, NamedTuple, TypeVar, cast, overload
+from typing import Any, Generic, NamedTuple, TypeVar, cast, overload
 
 from aioesphomeapi import (
     APIClient,
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index cfc8d5a5e7d..8d9f751c348 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 from ast import literal_eval
 import asyncio
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 import datetime as dt
 from functools import lru_cache, partial, wraps
@@ -12,7 +13,7 @@ import logging
 from operator import attrgetter
 import ssl
 import time
-from typing import Any, Awaitable, Callable, Union, cast
+from typing import Any, Union, cast
 import uuid
 
 import attr
diff --git a/homeassistant/components/mqtt/models.py b/homeassistant/components/mqtt/models.py
index 5c320ac0827..f5a0270481e 100644
--- a/homeassistant/components/mqtt/models.py
+++ b/homeassistant/components/mqtt/models.py
@@ -1,8 +1,9 @@
 """Modesl used by multiple MQTT modules."""
 from __future__ import annotations
 
+from collections.abc import Awaitable, Callable
 import datetime as dt
-from typing import Awaitable, Callable, Union
+from typing import Union
 
 import attr
 
diff --git a/homeassistant/components/pvpc_hourly_pricing/__init__.py b/homeassistant/components/pvpc_hourly_pricing/__init__.py
index 05e7c5940b7..7ecc89020c0 100644
--- a/homeassistant/components/pvpc_hourly_pricing/__init__.py
+++ b/homeassistant/components/pvpc_hourly_pricing/__init__.py
@@ -1,7 +1,7 @@
 """The pvpc_hourly_pricing integration to collect Spain official electric prices."""
+from collections.abc import Mapping
 from datetime import datetime, timedelta
 import logging
-from typing import Mapping
 
 from aiopvpc import DEFAULT_POWER_KW, TARIFFS, PVPCData
 import voluptuous as vol
diff --git a/homeassistant/components/ssdp/__init__.py b/homeassistant/components/ssdp/__init__.py
index 46cdb362a71..7b855ca1f59 100644
--- a/homeassistant/components/ssdp/__init__.py
+++ b/homeassistant/components/ssdp/__init__.py
@@ -2,13 +2,13 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Awaitable, Mapping
+from collections.abc import Awaitable, Callable, Mapping
 from dataclasses import dataclass, field
 from datetime import timedelta
 from enum import Enum
 from ipaddress import IPv4Address, IPv6Address
 import logging
-from typing import Any, Callable
+from typing import Any
 
 from async_upnp_client.aiohttp import AiohttpSessionRequester
 from async_upnp_client.const import DeviceOrServiceType, SsdpHeaders, SsdpSource
diff --git a/homeassistant/components/tasmota/discovery.py b/homeassistant/components/tasmota/discovery.py
index 5ba4a4032f8..67aea199fe4 100644
--- a/homeassistant/components/tasmota/discovery.py
+++ b/homeassistant/components/tasmota/discovery.py
@@ -1,8 +1,8 @@
 """Support for Tasmota device discovery."""
 from __future__ import annotations
 
+from collections.abc import Awaitable, Callable
 import logging
-from typing import Awaitable, Callable
 
 from hatasmota.discovery import (
     TasmotaDiscovery,
diff --git a/homeassistant/components/websocket_api/const.py b/homeassistant/components/websocket_api/const.py
index 6e59a1dc01e..9428d6fd87d 100644
--- a/homeassistant/components/websocket_api/const.py
+++ b/homeassistant/components/websocket_api/const.py
@@ -2,16 +2,17 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Awaitable, Callable
 from concurrent import futures
 from functools import partial
 import json
-from typing import TYPE_CHECKING, Any, Awaitable, Callable, Final
+from typing import TYPE_CHECKING, Any, Final
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.json import JSONEncoder
 
 if TYPE_CHECKING:
-    from .connection import ActiveConnection
+    from .connection import ActiveConnection  # noqa: F401
 
 
 WebSocketCommandHandler = Callable[