From 43c4dec3edbea96d093dcfc7c71143e6edd443ea Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Mon, 19 Jun 2023 15:56:48 +0200
Subject: [PATCH] Explicitly opt-in to device name in the demo integration
 (#94647)

---
 homeassistant/components/demo/binary_sensor.py | 2 +-
 homeassistant/components/demo/button.py        | 1 +
 homeassistant/components/demo/climate.py       | 1 +
 homeassistant/components/demo/cover.py         | 1 +
 homeassistant/components/demo/date.py          | 1 +
 homeassistant/components/demo/datetime.py      | 1 +
 homeassistant/components/demo/light.py         | 1 +
 homeassistant/components/demo/number.py        | 1 +
 homeassistant/components/demo/select.py        | 1 +
 homeassistant/components/demo/sensor.py        | 1 +
 homeassistant/components/demo/switch.py        | 1 +
 homeassistant/components/demo/text.py          | 2 +-
 homeassistant/components/demo/time.py          | 1 +
 homeassistant/components/demo/update.py        | 1 +
 14 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/demo/binary_sensor.py b/homeassistant/components/demo/binary_sensor.py
index 9f808ae1f61..236d4bbb1b0 100644
--- a/homeassistant/components/demo/binary_sensor.py
+++ b/homeassistant/components/demo/binary_sensor.py
@@ -38,6 +38,7 @@ class DemoBinarySensor(BinarySensorEntity):
     """representation of a Demo binary sensor."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
@@ -49,7 +50,6 @@ class DemoBinarySensor(BinarySensorEntity):
     ) -> None:
         """Initialize the demo sensor."""
         self._unique_id = unique_id
-        self._attr_name = None
         self._state = state
         self._attr_device_class = device_class
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/demo/button.py b/homeassistant/components/demo/button.py
index 70c255ad4b5..f7a653e1779 100644
--- a/homeassistant/components/demo/button.py
+++ b/homeassistant/components/demo/button.py
@@ -31,6 +31,7 @@ class DemoButton(ButtonEntity):
     """Representation of a demo button entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/climate.py b/homeassistant/components/demo/climate.py
index 9855bfc2695..340a4b306cb 100644
--- a/homeassistant/components/demo/climate.py
+++ b/homeassistant/components/demo/climate.py
@@ -92,6 +92,7 @@ class DemoClimate(ClimateEntity):
     """Representation of a demo climate device."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
     _attr_translation_key = "ubercool"
 
diff --git a/homeassistant/components/demo/cover.py b/homeassistant/components/demo/cover.py
index 3d611297c0b..42e30aa8336 100644
--- a/homeassistant/components/demo/cover.py
+++ b/homeassistant/components/demo/cover.py
@@ -58,6 +58,7 @@ class DemoCover(CoverEntity):
     """Representation of a demo cover."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/date.py b/homeassistant/components/demo/date.py
index 718fa3dc4a4..4129d0d392a 100644
--- a/homeassistant/components/demo/date.py
+++ b/homeassistant/components/demo/date.py
@@ -35,6 +35,7 @@ class DemoDate(DateEntity):
     """Representation of a Demo date entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/datetime.py b/homeassistant/components/demo/datetime.py
index 57d14be24b6..b769f9baba3 100644
--- a/homeassistant/components/demo/datetime.py
+++ b/homeassistant/components/demo/datetime.py
@@ -35,6 +35,7 @@ class DemoDateTime(DateTimeEntity):
     """Representation of a Demo date/time entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/light.py b/homeassistant/components/demo/light.py
index 91fc49b7c7e..fbc35965dc4 100644
--- a/homeassistant/components/demo/light.py
+++ b/homeassistant/components/demo/light.py
@@ -96,6 +96,7 @@ class DemoLight(LightEntity):
     """Representation of a demo light."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/number.py b/homeassistant/components/demo/number.py
index 38bab325c92..719b1078b8c 100644
--- a/homeassistant/components/demo/number.py
+++ b/homeassistant/components/demo/number.py
@@ -79,6 +79,7 @@ class DemoNumber(NumberEntity):
     """Representation of a demo Number entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/select.py b/homeassistant/components/demo/select.py
index 48ad4c6931b..6349b10040c 100644
--- a/homeassistant/components/demo/select.py
+++ b/homeassistant/components/demo/select.py
@@ -38,6 +38,7 @@ class DemoSelect(SelectEntity):
     """Representation of a demo select entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/sensor.py b/homeassistant/components/demo/sensor.py
index 81795540d1f..26689582fae 100644
--- a/homeassistant/components/demo/sensor.py
+++ b/homeassistant/components/demo/sensor.py
@@ -142,6 +142,7 @@ class DemoSensor(SensorEntity):
     """Representation of a Demo sensor."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/switch.py b/homeassistant/components/demo/switch.py
index 080488642e7..49e06839be5 100644
--- a/homeassistant/components/demo/switch.py
+++ b/homeassistant/components/demo/switch.py
@@ -37,6 +37,7 @@ class DemoSwitch(SwitchEntity):
     """Representation of a demo switch."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/text.py b/homeassistant/components/demo/text.py
index ff50e508354..7c243b73ea5 100644
--- a/homeassistant/components/demo/text.py
+++ b/homeassistant/components/demo/text.py
@@ -54,6 +54,7 @@ class DemoText(TextEntity):
     """Representation of a demo text entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
@@ -69,7 +70,6 @@ class DemoText(TextEntity):
     ) -> None:
         """Initialize the Demo text entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = None
         self._attr_native_value = native_value
         self._attr_icon = icon
         self._attr_mode = mode
diff --git a/homeassistant/components/demo/time.py b/homeassistant/components/demo/time.py
index d5e34779927..0384c0822f4 100644
--- a/homeassistant/components/demo/time.py
+++ b/homeassistant/components/demo/time.py
@@ -25,6 +25,7 @@ class DemoTime(TimeEntity):
     """Representation of a Demo time entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
diff --git a/homeassistant/components/demo/update.py b/homeassistant/components/demo/update.py
index f89f5a160e2..6373c485037 100644
--- a/homeassistant/components/demo/update.py
+++ b/homeassistant/components/demo/update.py
@@ -88,6 +88,7 @@ class DemoUpdate(UpdateEntity):
     """Representation of a demo update entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(