Check isinstance on collections.abc, not typing classes

homeassistant/components/smartthings/climate.py

@@ -1,7 +1,8 @@
 """Support for climate devices through the SmartThings cloud API."""
 import asyncio
+from collections.abc import Iterable
 import logging
-from typing import Iterable, Optional, Sequence
+from typing import Optional, Sequence
 
 from pysmartthings import Attribute, Capability
 

homeassistant/helpers/template.py

@@ -1,5 +1,6 @@
 """Template helper methods for rendering strings with Home Assistant data."""
 import base64
+import collections.abc
 from datetime import datetime
 from functools import wraps
 import json
@@ -503,7 +504,7 @@ def expand(hass: HomeAssistantType, *args: Any) -> Iterable[State]:
                 continue
         elif isinstance(entity, State):
             entity_id = entity.entity_id
-        elif isinstance(entity, Iterable):
+        elif isinstance(entity, collections.abc.Iterable):
             search += entity
             continue
         else:

homeassistant/scripts/check_config.py

@@ -1,10 +1,11 @@
 """Script to check the configuration file."""
 import argparse
 from collections import OrderedDict
+from collections.abc import Mapping, Sequence
 from glob import glob
 import logging
 import os
-from typing import Any, Callable, Dict, List, Sequence, Tuple
+from typing import Any, Callable, Dict, List, Tuple
 from unittest.mock import patch
 
 from homeassistant import bootstrap, core
@@ -252,7 +253,7 @@ def sort_dict_key(val):
     indent_str = indent_count * " "
     if listi or isinstance(layer, list):
         indent_str = indent_str[:-1] + "-"
-    if isinstance(layer, Dict):
+    if isinstance(layer, Mapping):
         for key, value in sorted(layer.items(), key=sort_dict_key):
             if isinstance(value, (dict, list)):
                 print(indent_str, str(key) + ":", line_info(value, **kwargs))