Merge branch 'dev' into refactor-uom-compat-lookup

Remove extra check - ignore arg type
Refactor native UOM compatibility helpers for sensor and number entity platform to not lookup None key
2025-11-14 21:40:16 +00:00 · 2025-09-03 21:16:06 +02:00 · 2025-08-22 16:55:42 +00:00 · 2025-08-20 05:34:15 +00:00
4 changed files with 6 additions and 5 deletions
--- a/homeassistant/components/number/init.py
+++ b/homeassistant/components/number/init.py
@@ -375,7 +375,8 @@ class NumberEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
        """Process ambiguous units."""
        native_unit_of_measurement = self.native_unit_of_measurement
        return AMBIGUOUS_UNITS.get(
-            native_unit_of_measurement, native_unit_of_measurement
+            native_unit_of_measurement,  # type: ignore[arg-type]
+            native_unit_of_measurement,  # type: ignore[arg-type]
        )

    @property
--- a/homeassistant/components/number/const.py
+++ b/homeassistant/components/number/const.py
@@ -560,7 +560,7 @@ UNIT_CONVERTERS: dict[NumberDeviceClass, type[BaseUnitConverter]] = {

 # We translate units that were using using the legacy coding of μ \u00b5
 # to units using recommended coding of μ \u03bc
-AMBIGUOUS_UNITS: dict[str | None, str] = {
+AMBIGUOUS_UNITS: dict[str, str] = {
    "\u00b5Sv/h": "μSv/h",  # aranet: radiation rate
    "\u00b5S/cm": UnitOfConductivity.MICROSIEMENS_PER_CM,
    "\u00b5V": UnitOfElectricPotential.MICROVOLT,
--- a/homeassistant/components/sensor/init.py
+++ b/homeassistant/components/sensor/init.py
@@ -476,8 +476,8 @@ class SensorEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
        """Process ambiguous units."""
        native_unit_of_measurement = self.native_unit_of_measurement
        return AMBIGUOUS_UNITS.get(
-            native_unit_of_measurement,
-            native_unit_of_measurement,
+            native_unit_of_measurement,  # type: ignore[arg-type]
+            native_unit_of_measurement,  # type: ignore[arg-type]
        )

    @cached_property
--- a/homeassistant/components/sensor/const.py
+++ b/homeassistant/components/sensor/const.py
@@ -792,7 +792,7 @@ STATE_CLASS_UNITS: dict[SensorStateClass | str, set[type[StrEnum] | str | None]]

 # We translate units that were using using the legacy coding of μ \u00b5
 # to units using recommended coding of μ \u03bc
-AMBIGUOUS_UNITS: dict[str | None, str] = {
+AMBIGUOUS_UNITS: dict[str, str] = {
    "\u00b5Sv/h": "μSv/h",  # aranet: radiation rate
    "\u00b5S/cm": UnitOfConductivity.MICROSIEMENS_PER_CM,
    "\u00b5V": UnitOfElectricPotential.MICROVOLT,
Author	SHA1	Message	Date
Jan Bouwhuis	0d203acd0f	Merge branch 'dev' into refactor-uom-compat-lookup	2025-09-03 21:16:06 +02:00
jbouwh	76cbe7af73	Remove extra check - ignore arg type	2025-08-22 16:55:42 +00:00
jbouwh	32800a0453	Refactor native UOM compatibility helpers for sensor and number entity platform to not lookup `None` key	2025-08-20 05:34:15 +00:00