Use strings instead of f-strings for constants

homeassistant/components/accuweather/const.py

@@ -1,6 +1,7 @@
 """Constants for AccuWeather integration."""
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
+    CONCENTRATION_PARTS_PER_CUBIC_METER,
     DEVICE_CLASS_TEMPERATURE,
     LENGTH_FEET,
     LENGTH_INCHES,
@@ -13,7 +14,6 @@
     TEMP_FAHRENHEIT,
     TIME_HOURS,
     UV_INDEX,
-    VOLUME_CUBIC_METERS,
 )
 
 ATTRIBUTION = "Data provided by AccuWeather"
@@ -22,7 +22,6 @@
 ATTR_LABEL = "label"
 ATTR_UNIT_IMPERIAL = "Imperial"
 ATTR_UNIT_METRIC = "Metric"
-CONCENTRATION_PARTS_PER_CUBIC_METER = f"p/{VOLUME_CUBIC_METERS}"
 COORDINATOR = "coordinator"
 DOMAIN = "accuweather"
 MANUFACTURER = "AccuWeather, Inc."

homeassistant/components/ambient_station/__init__.py

@@ -9,17 +9,16 @@
 from homeassistant.components.binary_sensor import DEVICE_CLASS_CONNECTIVITY
 from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
-    AREA_SQUARE_METERS,
     ATTR_LOCATION,
     ATTR_NAME,
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
     CONF_API_KEY,
     DEGREE,
     EVENT_HOMEASSISTANT_STOP,
+    IRRADIATION_WATTS_PER_SQUARE_METER,
     LIGHT_LUX,
     PERCENTAGE,
-    POWER_WATT,
     PRESSURE_INHG,
     SPEED_MILES_PER_HOUR,
     TEMP_FAHRENHEIT,
@@ -211,7 +210,7 @@
     TYPE_SOILTEMP9F: ("Soil Temp 9", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"),
     TYPE_SOLARRADIATION: (
         "Solar Rad",
-        f"{POWER_WATT}/{AREA_SQUARE_METERS}",
+        IRRADIATION_WATTS_PER_SQUARE_METER,
         TYPE_SENSOR,
         None,
     ),

homeassistant/components/buienradar/sensor.py

@@ -32,10 +32,10 @@
     LENGTH_KILOMETERS,
     LENGTH_MILLIMETERS,
     PERCENTAGE,
+    PRECIPITATION_MILLIMETERS_PER_HOUR,
     PRESSURE_HPA,
     SPEED_KILOMETERS_PER_HOUR,
     TEMP_CELSIUS,
-    TIME_HOURS,
 )
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
@@ -85,13 +85,13 @@
     "windgust": ["Wind gust", SPEED_KILOMETERS_PER_HOUR, "mdi:weather-windy"],
     "precipitation": [
         "Precipitation",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "mdi:weather-pouring",
     ],
     "irradiance": ["Irradiance", IRRADIATION_WATTS_PER_SQUARE_METER, "mdi:sunglasses"],
     "precipitation_forecast_average": [
         "Precipitation forecast average",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "mdi:weather-pouring",
     ],
     "precipitation_forecast_total": [

homeassistant/components/comfoconnect/sensor.py

@@ -33,8 +33,7 @@
     POWER_WATT,
     TEMP_CELSIUS,
     TIME_DAYS,
-    TIME_HOURS,
-    VOLUME_CUBIC_METERS,
+    VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
 )
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -160,14 +159,14 @@
     ATTR_AIR_FLOW_SUPPLY: {
         ATTR_DEVICE_CLASS: None,
         ATTR_LABEL: "Supply airflow",
-        ATTR_UNIT: f"{VOLUME_CUBIC_METERS}/{TIME_HOURS}",
+        ATTR_UNIT: VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
         ATTR_ICON: "mdi:fan",
         ATTR_ID: SENSOR_FAN_SUPPLY_FLOW,
     },
     ATTR_AIR_FLOW_EXHAUST: {
         ATTR_DEVICE_CLASS: None,
         ATTR_LABEL: "Exhaust airflow",
-        ATTR_UNIT: f"{VOLUME_CUBIC_METERS}/{TIME_HOURS}",
+        ATTR_UNIT: VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
         ATTR_ICON: "mdi:fan",
         ATTR_ID: SENSOR_FAN_EXHAUST_FLOW,
     },

homeassistant/components/darksky/sensor.py

@@ -18,15 +18,14 @@
     DEGREE,
     LENGTH_CENTIMETERS,
     LENGTH_KILOMETERS,
-    LENGTH_MILLIMETERS,
     PERCENTAGE,
+    PRECIPITATION_MILLIMETERS_PER_HOUR,
     PRESSURE_MBAR,
     SPEED_KILOMETERS_PER_HOUR,
     SPEED_METERS_PER_SECOND,
     SPEED_MILES_PER_HOUR,
     TEMP_CELSIUS,
     TEMP_FAHRENHEIT,
-    TIME_HOURS,
     UV_INDEX,
 )
 import homeassistant.helpers.config_validation as cv
@@ -111,11 +110,11 @@
     ],
     "precip_intensity": [
         "Precip Intensity",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "in",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "mdi:weather-rainy",
         ["currently", "minutely", "hourly", "daily"],
     ],
@@ -331,11 +330,11 @@
     ],
     "precip_intensity_max": [
         "Daily Max Precip Intensity",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "in",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "mdi:thermometer",
         ["daily"],
     ],

homeassistant/components/isy994/const.py

@@ -44,13 +44,14 @@
 from homeassistant.components.sensor import DOMAIN as SENSOR
 from homeassistant.components.switch import DOMAIN as SWITCH
 from homeassistant.const import (
-    AREA_SQUARE_METERS,
     CONCENTRATION_PARTS_PER_MILLION,
     CURRENCY_CENT,
     CURRENCY_DOLLAR,
     DEGREE,
     ENERGY_KILO_WATT_HOUR,
+    ENERGY_WATT_HOUR,
     FREQUENCY_HERTZ,
+    IRRADIATION_WATTS_PER_SQUARE_METER,
     LENGTH_CENTIMETERS,
     LENGTH_FEET,
     LENGTH_INCHES,
@@ -62,15 +63,20 @@
     MASS_KILOGRAMS,
     MASS_POUNDS,
     PERCENTAGE,
+    POWER_KILO_WATT,
     POWER_WATT,
+    PRECIPITATION_MILLIMETERS_PER_HOUR,
     PRESSURE_HPA,
     PRESSURE_INHG,
     PRESSURE_MBAR,
     SERVICE_LOCK,
     SERVICE_UNLOCK,
+    SPEED_INCHES_PER_DAY,
+    SPEED_INCHES_PER_HOUR,
     SPEED_KILOMETERS_PER_HOUR,
     SPEED_METERS_PER_SECOND,
     SPEED_MILES_PER_HOUR,
+    SPEED_MILLIMETERS_PER_DAY,
     STATE_CLOSED,
     STATE_CLOSING,
     STATE_LOCKED,
@@ -95,6 +101,8 @@
     VOLT,
     VOLUME_CUBIC_FEET,
     VOLUME_CUBIC_METERS,
+    VOLUME_FLOW_RATE_CUBIC_FEET_PER_MINUTE,
+    VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
     VOLUME_GALLONS,
     VOLUME_LITERS,
 )
@@ -328,8 +336,8 @@
     "4": TEMP_CELSIUS,
     "5": LENGTH_CENTIMETERS,
     "6": VOLUME_CUBIC_FEET,
-    "7": f"{VOLUME_CUBIC_FEET}/{TIME_MINUTES}",
-    "8": f"{VOLUME_CUBIC_METERS}",
+    "7": VOLUME_FLOW_RATE_CUBIC_FEET_PER_MINUTE,
+    "8": VOLUME_CUBIC_METERS,
     "9": TIME_DAYS,
     "10": TIME_DAYS,
     "12": "dB",
@@ -343,13 +351,13 @@
     "21": "%AH",
     "22": "%RH",
     "23": PRESSURE_INHG,
-    "24": f"{LENGTH_INCHES}/{TIME_HOURS}",
+    "24": SPEED_INCHES_PER_HOUR,
     UOM_INDEX: "index",  # Index type. Use "node.formatted" for value
     "26": TEMP_KELVIN,
     "27": "keyword",
     "28": MASS_KILOGRAMS,
     "29": "kV",
-    "30": "kW",
+    "30": POWER_KILO_WATT,
     "31": "kPa",
     "32": SPEED_KILOMETERS_PER_HOUR,
     "33": ENERGY_KILO_WATT_HOUR,
@@ -358,14 +366,14 @@
     "36": LIGHT_LUX,
     "37": "mercalli",
     "38": LENGTH_METERS,
-    "39": f"{VOLUME_CUBIC_METERS}/{TIME_HOURS}",
+    "39": VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
     "40": SPEED_METERS_PER_SECOND,
     "41": "mA",
     "42": TIME_MILLISECONDS,
     "43": "mV",
     "44": TIME_MINUTES,
     "45": TIME_MINUTES,
-    "46": f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+    "46": PRECIPITATION_MILLIMETERS_PER_HOUR,
     "47": TIME_MONTHS,
     "48": SPEED_MILES_PER_HOUR,
     "49": SPEED_METERS_PER_SECOND,
@@ -388,7 +396,7 @@
     "71": UV_INDEX,
     "72": VOLT,
     "73": POWER_WATT,
-    "74": f"{POWER_WATT}/{AREA_SQUARE_METERS}",
+    "74": IRRADIATION_WATTS_PER_SQUARE_METER,
     "75": "weekday",
     "76": DEGREE,
     "77": TIME_YEARS,
@@ -408,7 +416,7 @@
     "103": CURRENCY_DOLLAR,
     "104": CURRENCY_CENT,
     "105": LENGTH_INCHES,
-    "106": f"{LENGTH_MILLIMETERS}/{TIME_DAYS}",
+    "106": SPEED_MILLIMETERS_PER_DAY,
     "107": "",  # raw 1-byte unsigned value
     "108": "",  # raw 2-byte unsigned value
     "109": "",  # raw 3-byte unsigned value
@@ -420,8 +428,8 @@
     "116": LENGTH_MILES,
     "117": PRESSURE_MBAR,
     "118": PRESSURE_HPA,
-    "119": f"{POWER_WATT}{TIME_HOURS}",
-    "120": f"{LENGTH_INCHES}/{TIME_DAYS}",
+    "119": ENERGY_WATT_HOUR,
+    "120": SPEED_INCHES_PER_DAY,
 }
 
 UOM_TO_STATES = {

homeassistant/components/rfxtrx/__init__.py

@@ -27,11 +27,11 @@
     LENGTH_MILLIMETERS,
     PERCENTAGE,
     POWER_WATT,
+    PRECIPITATION_MILLIMETERS_PER_HOUR,
     PRESSURE_HPA,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     SPEED_METERS_PER_SECOND,
     TEMP_CELSIUS,
-    TIME_HOURS,
     UV_INDEX,
     VOLT,
 )
@@ -70,7 +70,7 @@
         ("Humidity", PERCENTAGE),
         ("Barometer", PRESSURE_HPA),
         ("Wind direction", DEGREE),
-        ("Rain rate", f"{LENGTH_MILLIMETERS}/{TIME_HOURS}"),
+        ("Rain rate", PRECIPITATION_MILLIMETERS_PER_HOUR),
         ("Energy usage", POWER_WATT),
         ("Total usage", ENERGY_KILO_WATT_HOUR),
         ("Sound", None),

homeassistant/components/tellduslive/sensor.py

@@ -8,9 +8,9 @@
     LIGHT_LUX,
     PERCENTAGE,
     POWER_WATT,
+    PRECIPITATION_MILLIMETERS_PER_HOUR,
     SPEED_METERS_PER_SECOND,
     TEMP_CELSIUS,
-    TIME_HOURS,
     UV_INDEX,
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -40,7 +40,7 @@
     SENSOR_TYPE_HUMIDITY: ["Humidity", PERCENTAGE, None, DEVICE_CLASS_HUMIDITY],
     SENSOR_TYPE_RAINRATE: [
         "Rain rate",
-        f"{LENGTH_MILLIMETERS}/{TIME_HOURS}",
+        PRECIPITATION_MILLIMETERS_PER_HOUR,
         "mdi:water",
         None,
     ],

homeassistant/components/zha/core/channels/smartenergy.py

@@ -5,8 +5,8 @@
     POWER_WATT,
     TIME_HOURS,
     TIME_SECONDS,
-    VOLUME_CUBIC_FEET,
-    VOLUME_CUBIC_METERS,
+    VOLUME_FLOW_RATE_CUBIC_FEET_PER_MINUTE,
+    VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
 )
 from homeassistant.core import callback
 
@@ -63,8 +63,8 @@ class Metering(ZigbeeChannel):
 
     unit_of_measure_map = {
         0x00: POWER_WATT,
-        0x01: f"{VOLUME_CUBIC_METERS}/{TIME_HOURS}",
-        0x02: f"{VOLUME_CUBIC_FEET}/{TIME_HOURS}",
+        0x01: VOLUME_FLOW_RATE_CUBIC_METERS_PER_HOUR,
+        0x02: VOLUME_FLOW_RATE_CUBIC_FEET_PER_MINUTE,
         0x03: f"ccf/{TIME_HOURS}",
         0x04: f"US gal/{TIME_HOURS}",
         0x05: f"IMP gal/{TIME_HOURS}",