Merge pull request #420 from alandtse/dev

fix: use old pressure consts for ha < 2022.11 (#418)
alandtse · Dec 11, 2022 · 47dc540 · 47dc540
2 parents ff25056 + ad9c41c
commit 47dc540
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/custom_components/tesla_custom/sensor.py b/custom_components/tesla_custom/sensor.py
@@ -16,10 +16,11 @@
     PERCENTAGE,
     POWER_WATT,
     POWER_KILO_WATT,
+    PRESSURE_BAR,
+    PRESSURE_PSI,
     SPEED_MILES_PER_HOUR,
     TEMP_CELSIUS,
     TIME_HOURS,
-    UnitOfPressure,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.icon import icon_for_battery_level
@@ -534,8 +535,8 @@ def __init__(
         self.type = tpms_sensor
         self._attr_device_class = SensorDeviceClass.PRESSURE
         self._attr_state_class = SensorStateClass.MEASUREMENT
-        self._attr_native_unit_of_measurement = UnitOfPressure.BAR
-        self._attr_suggested_unit_of_measurement = UnitOfPressure.PSI
+        self._attr_native_unit_of_measurement = PRESSURE_BAR
+        self._attr_suggested_unit_of_measurement = PRESSURE_PSI
         self._attr_icon = "mdi:gauge-full"
 
     @property

diff --git a/tests/test_sensor.py b/tests/test_sensor.py
@@ -14,11 +14,12 @@
     LENGTH_MILES,
     PERCENTAGE,
     POWER_WATT,
+    PRESSURE_BAR,
+    PRESSURE_PSI,
     SPEED_KILOMETERS_PER_HOUR,
     SPEED_MILES_PER_HOUR,
     STATE_UNKNOWN,
     TEMP_CELSIUS,
-    UnitOfPressure,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -401,16 +402,16 @@ async def test_tpms_pressure_sensor(hass: HomeAssistant) -> None:
                 round(
                     car_mock_data.VEHICLE_DATA["vehicle_state"]["tpms_pressure_fl"], 2
                 ),
-                UnitOfPressure.BAR,
-                UnitOfPressure.PSI,
+                PRESSURE_BAR,
+                PRESSURE_PSI,
             ),
             prec,
         ),
     )
 
     assert state_fl.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE
     assert state_fl.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    assert state_fl.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.PSI
+    assert state_fl.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_PSI
 
     assert (
         state_fl.attributes.get("tpms_last_seen_pressure_timestamp")
@@ -431,16 +432,16 @@ async def test_tpms_pressure_sensor(hass: HomeAssistant) -> None:
                 round(
                     car_mock_data.VEHICLE_DATA["vehicle_state"]["tpms_pressure_fr"], 2
                 ),
-                UnitOfPressure.BAR,
-                UnitOfPressure.PSI,
+                PRESSURE_BAR,
+                PRESSURE_PSI,
             ),
             prec,
         ),
     )
 
     assert state_fr.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE
     assert state_fr.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    assert state_fr.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.PSI
+    assert state_fr.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_PSI
 
     assert (
         state_fr.attributes.get("tpms_last_seen_pressure_timestamp")
@@ -461,16 +462,16 @@ async def test_tpms_pressure_sensor(hass: HomeAssistant) -> None:
                 round(
                     car_mock_data.VEHICLE_DATA["vehicle_state"]["tpms_pressure_rl"], 2
                 ),
-                UnitOfPressure.BAR,
-                UnitOfPressure.PSI,
+                PRESSURE_BAR,
+                PRESSURE_PSI,
             ),
             prec,
         ),
     )
 
     assert state_rl.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE
     assert state_rl.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    assert state_rl.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.PSI
+    assert state_rl.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_PSI
 
     assert (
         state_rl.attributes.get("tpms_last_seen_pressure_timestamp")
@@ -491,16 +492,16 @@ async def test_tpms_pressure_sensor(hass: HomeAssistant) -> None:
                 round(
                     car_mock_data.VEHICLE_DATA["vehicle_state"]["tpms_pressure_rr"], 2
                 ),
-                UnitOfPressure.BAR,
-                UnitOfPressure.PSI,
+                PRESSURE_BAR,
+                PRESSURE_PSI,
             ),
             prec,
         ),
     )
 
     assert state_rr.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE
     assert state_rr.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    assert state_rr.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.PSI
+    assert state_rr.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_PSI
 
     assert (
         state_rr.attributes.get("tpms_last_seen_pressure_timestamp")
@@ -526,6 +527,6 @@ async def test_tpms_pressure_none(hass: HomeAssistant) -> None:
 
     assert state_fl.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE
     assert state_fl.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    assert state_fl.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.PSI
+    assert state_fl.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_PSI
 
     assert state_fl.attributes.get("tpms_last_seen_pressure_timestamp") == None