Remove unnecessary unit validation (#352)

Author: TheJulianJES

tests/test_units.py

@@ -22,7 +22,7 @@
     NumberMode,
 )
 from zha.application.registries import PLATFORM_ENTITIES
-from zha.units import UnitOfMass, UnitOfTemperature, UnitOfTime, validate_unit
+from zha.units import UnitOfMass, UnitOfTemperature, UnitOfTime
 from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent
 from zha.zigbee.cluster_handlers.const import (
     CLUSTER_HANDLER_ANALOG_OUTPUT,
@@ -266,9 +266,7 @@ def _init_from_quirks_metadata(self, entity_metadata: NumberMetadata) -> None:
                 _LOGGER,
             )
         if entity_metadata.unit is not None:
-            self._attr_native_unit_of_measurement = validate_unit(
-                entity_metadata.unit
-            ).value
+            self._attr_native_unit_of_measurement = entity_metadata.unit
 
     @functools.cached_property
     def info_object(self) -> NumberConfigurationEntityInfo:

zha/application/platforms/number/__init__.py

@@ -56,7 +56,6 @@
     UnitOfTime,
     UnitOfVolume,
     UnitOfVolumeFlowRate,
-    validate_unit,
 )
 from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent
 from zha.zigbee.cluster_handlers.const import (
@@ -243,9 +242,7 @@ def _init_from_quirks_metadata(self, entity_metadata: ZCLSensorMetadata) -> None
                 entity_metadata.state_class
             )
         if entity_metadata.unit is not None:
-            self._attr_native_unit_of_measurement = validate_unit(
-                entity_metadata.unit
-            ).value
+            self._attr_native_unit_of_measurement = entity_metadata.unit
 
     @functools.cached_property
     def info_object(self) -> SensorEntityInfo:

zha/application/platforms/sensor/__init__.py

@@ -1,6 +1,6 @@
 """Units of measure for Zigbee Home Automation."""
 
-from enum import Enum, StrEnum
+from enum import StrEnum
 from typing import Final
 
 
@@ -157,25 +157,3 @@ class UnitOfEnergy(StrEnum):
 
 # Percentage units
 PERCENTAGE: Final[str] = "%"
-
-
-UNITS_OF_MEASURE = {
-    UnitOfApparentPower.__name__: UnitOfApparentPower,
-    UnitOfPower.__name__: UnitOfPower,
-    UnitOfEnergy.__name__: UnitOfEnergy,
-    UnitOfElectricCurrent.__name__: UnitOfElectricCurrent,
-    UnitOfElectricPotential.__name__: UnitOfElectricPotential,
-    UnitOfTemperature.__name__: UnitOfTemperature,
-    UnitOfTime.__name__: UnitOfTime,
-    UnitOfFrequency.__name__: UnitOfFrequency,
-    UnitOfPressure.__name__: UnitOfPressure,
-    UnitOfVolume.__name__: UnitOfVolume,
-    UnitOfVolumeFlowRate.__name__: UnitOfVolumeFlowRate,
-    UnitOfLength.__name__: UnitOfLength,
-    UnitOfMass.__name__: UnitOfMass,
-}
-
-
-def validate_unit(external_unit: Enum) -> Enum:
-    """Validate and return a unit of measure."""
-    return UNITS_OF_MEASURE[type(external_unit).__name__](external_unit.value)