Use PEP 526 syntax with NamedTuples (#33081)

homeassistant/auth/models.py

@@ -123,4 +123,8 @@ class Credentials:
     is_new = attr.ib(type=bool, default=True)
 
 
-UserMeta = NamedTuple("UserMeta", [("name", Optional[str]), ("is_active", bool)])
+class UserMeta(NamedTuple):
+    """User metadata."""
+
+    name: Optional[str]
+    is_active: bool

homeassistant/components/tplink/light.py

@@ -75,30 +75,26 @@ def brightness_from_percentage(percent):
     return (percent * 255.0) / 100.0
 
 
-LightState = NamedTuple(
+class LightState(NamedTuple):
-    "LightState",
+    """Light state."""
-    (
+
-        ("state", bool),
+    state: bool
-        ("brightness", int),
+    brightness: int
-        ("color_temp", float),
+    color_temp: float
-        ("hs", Tuple[int, int]),
+    hs: Tuple[int, int]
-        ("emeter_params", dict),
+    emeter_params: dict
-    ),
-)
 
 
-LightFeatures = NamedTuple(
+class LightFeatures(NamedTuple):
-    "LightFeatures",
+    """Light features."""
-    (
+
-        ("sysinfo", Dict[str, Any]),
+    sysinfo: Dict[str, Any]
-        ("mac", str),
+    mac: str
-        ("alias", str),
+    alias: str
-        ("model", str),
+    model: str
-        ("supported_features", int),
+    supported_features: int
-        ("min_mireds", float),
+    min_mireds: float
-        ("max_mireds", float),
+    max_mireds: float
-    ),
-)
 
 
 class TPLinkSmartBulb(Light):

tests/components/tplink/test_light.py

@@ -26,20 +26,19 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-LightMockData = NamedTuple(
+
-    "LightMockData",
+class LightMockData(NamedTuple):
-    (
+    """Mock light data."""
-        ("sys_info", dict),
+
-        ("light_state", dict),
+    sys_info: dict
-        ("set_light_state", Callable[[dict], None]),
+    light_state: dict
-        ("set_light_state_mock", Mock),
+    set_light_state: Callable[[dict], None]
-        ("get_light_state_mock", Mock),
+    set_light_state_mock: Mock
-        ("current_consumption_mock", Mock),
+    get_light_state_mock: Mock
-        ("get_sysinfo_mock", Mock),
+    current_consumption_mock: Mock
-        ("get_emeter_daily_mock", Mock),
+    get_sysinfo_mock: Mock
-        ("get_emeter_monthly_mock", Mock),
+    get_emeter_daily_mock: Mock
-    ),
+    get_emeter_monthly_mock: Mock
-)
 
 
 @pytest.fixture(name="light_mock_data")

tests/components/vera/common.py

@@ -9,7 +9,11 @@ from homeassistant.components.vera import CONF_CONTROLLER, DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-ComponentData = NamedTuple("ComponentData", (("controller", VeraController),))
+
+class ComponentData(NamedTuple):
+    """Component data."""
+
+    controller: VeraController
 
 
 class ComponentFactory: