From 924dce1b86c271513fc03985ddba7eab677a8a6b Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Mon, 11 Jul 2022 17:44:07 +0200
Subject: [PATCH] Log warning if number entities set _attr_unit_of_measurement
 (#74987)

---
 homeassistant/components/number/__init__.py | 4 +++-
 homeassistant/components/zha/number.py      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/number/__init__.py b/homeassistant/components/number/__init__.py
index 1820e28bc4c..8c1800697a3 100644
--- a/homeassistant/components/number/__init__.py
+++ b/homeassistant/components/number/__init__.py
@@ -192,9 +192,10 @@ class NumberEntity(Entity):
     entity_description: NumberEntityDescription
     _attr_max_value: None
     _attr_min_value: None
+    _attr_mode: NumberMode = NumberMode.AUTO
     _attr_state: None = None
     _attr_step: None
-    _attr_mode: NumberMode = NumberMode.AUTO
+    _attr_unit_of_measurement: None  # Subclasses of NumberEntity should not set this
     _attr_value: None
     _attr_native_max_value: float
     _attr_native_min_value: float
@@ -369,6 +370,7 @@ class NumberEntity(Entity):
             return self._number_option_unit_of_measurement
 
         if hasattr(self, "_attr_unit_of_measurement"):
+            self._report_deprecated_number_entity()
             return self._attr_unit_of_measurement
         if (
             hasattr(self, "entity_description")
diff --git a/homeassistant/components/zha/number.py b/homeassistant/components/zha/number.py
index 36fc5267bd9..76b1121c2f0 100644
--- a/homeassistant/components/zha/number.py
+++ b/homeassistant/components/zha/number.py
@@ -521,7 +521,7 @@ class TimerDurationMinutes(ZHANumberConfigurationEntity, id_suffix="timer_durati
     _attr_icon: str = ICONS[14]
     _attr_native_min_value: float = 0x00
     _attr_native_max_value: float = 0x257
-    _attr_unit_of_measurement: str | None = UNITS[72]
+    _attr_native_unit_of_measurement: str | None = UNITS[72]
     _zcl_attribute: str = "timer_duration"
 
 
@@ -533,5 +533,5 @@ class FilterLifeTime(ZHANumberConfigurationEntity, id_suffix="filter_life_time")
     _attr_icon: str = ICONS[14]
     _attr_native_min_value: float = 0x00
     _attr_native_max_value: float = 0xFFFFFFFF
-    _attr_unit_of_measurement: str | None = UNITS[72]
+    _attr_native_unit_of_measurement: str | None = UNITS[72]
     _zcl_attribute: str = "filter_life_time"