From 25198242c10dc78ba9d19d1c4ba052f6f326c68d Mon Sep 17 00:00:00 2001 From: springstan <46536646+springstan@users.noreply.github.com> Date: Fri, 10 Apr 2020 21:10:10 +0200 Subject: [PATCH] Use TEMP_FAHRENHEIT constant (#33969) --- .../components/ambient_station/__init__.py | 49 ++++++++++--------- homeassistant/components/darksky/sensor.py | 23 ++++----- .../components/eight_sleep/sensor.py | 6 +-- tests/components/dyson/test_sensor.py | 2 +- 4 files changed, 41 insertions(+), 39 deletions(-) diff --git a/homeassistant/components/ambient_station/__init__.py b/homeassistant/components/ambient_station/__init__.py index 66a22d44366..12465dfd984 100644 --- a/homeassistant/components/ambient_station/__init__.py +++ b/homeassistant/components/ambient_station/__init__.py @@ -14,6 +14,7 @@ from homeassistant.const import ( CONF_API_KEY, EVENT_HOMEASSISTANT_STOP, SPEED_MILES_PER_HOUR, + TEMP_FAHRENHEIT, UNIT_PERCENTAGE, ) from homeassistant.core import callback @@ -150,9 +151,9 @@ SENSOR_TYPES = { TYPE_BATTOUT: ("Battery", None, TYPE_BINARY_SENSOR, "battery"), TYPE_CO2: ("co2", CONCENTRATION_PARTS_PER_MILLION, TYPE_SENSOR, None), TYPE_DAILYRAININ: ("Daily Rain", "in", TYPE_SENSOR, None), - TYPE_DEWPOINT: ("Dew Point", "°F", TYPE_SENSOR, "temperature"), + TYPE_DEWPOINT: ("Dew Point", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), TYPE_EVENTRAININ: ("Event Rain", "in", TYPE_SENSOR, None), - TYPE_FEELSLIKE: ("Feels Like", "°F", TYPE_SENSOR, "temperature"), + TYPE_FEELSLIKE: ("Feels Like", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), TYPE_HOURLYRAININ: ("Hourly Rain Rate", "in/hr", TYPE_SENSOR, None), TYPE_HUMIDITY10: ("Humidity 10", UNIT_PERCENTAGE, TYPE_SENSOR, "humidity"), TYPE_HUMIDITY1: ("Humidity 1", UNIT_PERCENTAGE, TYPE_SENSOR, "humidity"), @@ -189,30 +190,30 @@ SENSOR_TYPES = { TYPE_SOILHUM7: ("Soil Humidity 7", UNIT_PERCENTAGE, TYPE_SENSOR, "humidity"), TYPE_SOILHUM8: ("Soil Humidity 8", UNIT_PERCENTAGE, TYPE_SENSOR, "humidity"), TYPE_SOILHUM9: ("Soil Humidity 9", UNIT_PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILTEMP10F: ("Soil Temp 10", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP1F: ("Soil Temp 1", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP2F: ("Soil Temp 2", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP3F: ("Soil Temp 3", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP4F: ("Soil Temp 4", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP5F: ("Soil Temp 5", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP6F: ("Soil Temp 6", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP7F: ("Soil Temp 7", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP8F: ("Soil Temp 8", "°F", TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP9F: ("Soil Temp 9", "°F", TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP10F: ("Soil Temp 10", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP1F: ("Soil Temp 1", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP2F: ("Soil Temp 2", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP3F: ("Soil Temp 3", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP4F: ("Soil Temp 4", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP5F: ("Soil Temp 5", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP6F: ("Soil Temp 6", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP7F: ("Soil Temp 7", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP8F: ("Soil Temp 8", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_SOILTEMP9F: ("Soil Temp 9", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), TYPE_SOLARRADIATION: ("Solar Rad", "W/m^2", TYPE_SENSOR, None), TYPE_SOLARRADIATION_LX: ("Solar Rad (lx)", "lx", TYPE_SENSOR, "illuminance"), - TYPE_TEMP10F: ("Temp 10", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP1F: ("Temp 1", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP2F: ("Temp 2", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP3F: ("Temp 3", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP4F: ("Temp 4", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP5F: ("Temp 5", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP6F: ("Temp 6", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP7F: ("Temp 7", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP8F: ("Temp 8", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMP9F: ("Temp 9", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMPF: ("Temp", "°F", TYPE_SENSOR, "temperature"), - TYPE_TEMPINF: ("Inside Temp", "°F", TYPE_SENSOR, "temperature"), + TYPE_TEMP10F: ("Temp 10", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP1F: ("Temp 1", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP2F: ("Temp 2", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP3F: ("Temp 3", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP4F: ("Temp 4", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP5F: ("Temp 5", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP6F: ("Temp 6", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP7F: ("Temp 7", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP8F: ("Temp 8", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMP9F: ("Temp 9", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMPF: ("Temp", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_TEMPINF: ("Inside Temp", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), TYPE_TOTALRAININ: ("Lifetime Rain", "in", TYPE_SENSOR, None), TYPE_UV: ("uv", "Index", TYPE_SENSOR, None), TYPE_WEEKLYRAININ: ("Weekly Rain", "in", TYPE_SENSOR, None), diff --git a/homeassistant/components/darksky/sensor.py b/homeassistant/components/darksky/sensor.py index 5157ab6ed7d..c2f6ee83396 100644 --- a/homeassistant/components/darksky/sensor.py +++ b/homeassistant/components/darksky/sensor.py @@ -19,6 +19,7 @@ from homeassistant.const import ( SPEED_METERS_PER_SECOND, SPEED_MILES_PER_HOUR, TEMP_CELSIUS, + TEMP_FAHRENHEIT, TIME_HOURS, UNIT_PERCENTAGE, UNIT_UV_INDEX, @@ -136,7 +137,7 @@ SENSOR_TYPES = { "temperature": [ "Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -146,7 +147,7 @@ SENSOR_TYPES = { "apparent_temperature": [ "Apparent Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -156,7 +157,7 @@ SENSOR_TYPES = { "dew_point": [ "Dew Point", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -246,7 +247,7 @@ SENSOR_TYPES = { "apparent_temperature_max": [ "Daily High Apparent Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -256,7 +257,7 @@ SENSOR_TYPES = { "apparent_temperature_high": [ "Daytime High Apparent Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -266,7 +267,7 @@ SENSOR_TYPES = { "apparent_temperature_min": [ "Daily Low Apparent Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -276,7 +277,7 @@ SENSOR_TYPES = { "apparent_temperature_low": [ "Overnight Low Apparent Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -286,7 +287,7 @@ SENSOR_TYPES = { "temperature_max": [ "Daily High Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -296,7 +297,7 @@ SENSOR_TYPES = { "temperature_high": [ "Daytime High Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -306,7 +307,7 @@ SENSOR_TYPES = { "temperature_min": [ "Daily Low Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, @@ -316,7 +317,7 @@ SENSOR_TYPES = { "temperature_low": [ "Overnight Low Temperature", TEMP_CELSIUS, - "°F", + TEMP_FAHRENHEIT, TEMP_CELSIUS, TEMP_CELSIUS, TEMP_CELSIUS, diff --git a/homeassistant/components/eight_sleep/sensor.py b/homeassistant/components/eight_sleep/sensor.py index f5aa2cb1dca..ff6dff85aca 100644 --- a/homeassistant/components/eight_sleep/sensor.py +++ b/homeassistant/components/eight_sleep/sensor.py @@ -1,7 +1,7 @@ """Support for Eight Sleep sensors.""" import logging -from homeassistant.const import TEMP_CELSIUS, UNIT_PERCENTAGE +from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, UNIT_PERCENTAGE from . import ( CONF_SENSORS, @@ -167,7 +167,7 @@ class EightUserSensor(EightSleepUserEntity): if "bed_temp" in self._sensor: if self._units == "si": return TEMP_CELSIUS - return "°F" + return TEMP_FAHRENHEIT return None @property @@ -330,7 +330,7 @@ class EightRoomSensor(EightSleepUserEntity): """Return the unit the value is expressed in.""" if self._units == "si": return TEMP_CELSIUS - return "°F" + return TEMP_FAHRENHEIT @property def icon(self): diff --git a/tests/components/dyson/test_sensor.py b/tests/components/dyson/test_sensor.py index 7625b3c2a97..6dd29741153 100644 --- a/tests/components/dyson/test_sensor.py +++ b/tests/components/dyson/test_sensor.py @@ -228,7 +228,7 @@ class DysonTest(unittest.TestCase): sensor.entity_id = "sensor.dyson_1" assert not sensor.should_poll assert sensor.state == 71.3 - assert sensor.unit_of_measurement == "°F" + assert sensor.unit_of_measurement == TEMP_FAHRENHEIT assert sensor.name == "Device_name Temperature" assert sensor.entity_id == "sensor.dyson_1"