evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use enums in openweathermap (#62086)

Browse source
This commit is contained in:
Robert Hillis 2021-12-16 16:25:49 -05:00 • committed by GitHub
parent 5a268419f5
commit 2ab13f3603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

47
homeassistant/components/openweathermap/const.py
View file

@ -2,8 +2,9 @@
from __future__ import annotations from __future__ import annotations
from homeassistant.components.sensor import ( from homeassistant.components.sensor import (
STATE_CLASS_MEASUREMENT, SensorDeviceClass,
SensorEntityDescription, SensorEntityDescription,
SensorStateClass,
) )
from homeassistant.components.weather import ( from homeassistant.components.weather import (
ATTR_CONDITION_CLOUDY, ATTR_CONDITION_CLOUDY,
@ -30,10 +31,6 @@ from homeassistant.components.weather import (
) )
from homeassistant.const import ( from homeassistant.const import (
DEGREE, DEGREE,
DEVICE_CLASS_HUMIDITY,
DEVICE_CLASS_PRESSURE,
DEVICE_CLASS_TEMPERATURE,
DEVICE_CLASS_TIMESTAMP,
LENGTH_MILLIMETERS, LENGTH_MILLIMETERS,
PERCENTAGE, PERCENTAGE,
PRESSURE_HPA, PRESSURE_HPA,
@ -175,66 +172,66 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
key=ATTR_API_DEW_POINT, key=ATTR_API_DEW_POINT,
name="Dew Point", name="Dew Point",
native_unit_of_measurement=TEMP_CELSIUS, native_unit_of_measurement=TEMP_CELSIUS,
device_class=DEVICE_CLASS_TEMPERATURE, device_class=SensorDeviceClass.TEMPERATURE,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_TEMPERATURE, key=ATTR_API_TEMPERATURE,
name="Temperature", name="Temperature",
native_unit_of_measurement=TEMP_CELSIUS, native_unit_of_measurement=TEMP_CELSIUS,
device_class=DEVICE_CLASS_TEMPERATURE, device_class=SensorDeviceClass.TEMPERATURE,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_FEELS_LIKE_TEMPERATURE, key=ATTR_API_FEELS_LIKE_TEMPERATURE,
name="Feels like temperature", name="Feels like temperature",
native_unit_of_measurement=TEMP_CELSIUS, native_unit_of_measurement=TEMP_CELSIUS,
device_class=DEVICE_CLASS_TEMPERATURE, device_class=SensorDeviceClass.TEMPERATURE,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_WIND_SPEED, key=ATTR_API_WIND_SPEED,
name="Wind speed", name="Wind speed",
native_unit_of_measurement=SPEED_METERS_PER_SECOND, native_unit_of_measurement=SPEED_METERS_PER_SECOND,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_WIND_BEARING, key=ATTR_API_WIND_BEARING,
name="Wind bearing", name="Wind bearing",
native_unit_of_measurement=DEGREE, native_unit_of_measurement=DEGREE,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_HUMIDITY, key=ATTR_API_HUMIDITY,
name="Humidity", name="Humidity",
native_unit_of_measurement=PERCENTAGE, native_unit_of_measurement=PERCENTAGE,
device_class=DEVICE_CLASS_HUMIDITY, device_class=SensorDeviceClass.HUMIDITY,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_PRESSURE, key=ATTR_API_PRESSURE,
name="Pressure", name="Pressure",
native_unit_of_measurement=PRESSURE_HPA, native_unit_of_measurement=PRESSURE_HPA,
device_class=DEVICE_CLASS_PRESSURE, device_class=SensorDeviceClass.PRESSURE,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_CLOUDS, key=ATTR_API_CLOUDS,
name="Cloud coverage", name="Cloud coverage",
native_unit_of_measurement=PERCENTAGE, native_unit_of_measurement=PERCENTAGE,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_RAIN, key=ATTR_API_RAIN,
name="Rain", name="Rain",
native_unit_of_measurement=LENGTH_MILLIMETERS, native_unit_of_measurement=LENGTH_MILLIMETERS,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_SNOW, key=ATTR_API_SNOW,
name="Snow", name="Snow",
native_unit_of_measurement=LENGTH_MILLIMETERS, native_unit_of_measurement=LENGTH_MILLIMETERS,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_PRECIPITATION_KIND, key=ATTR_API_PRECIPITATION_KIND,
@ -244,7 +241,7 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
key=ATTR_API_UV_INDEX, key=ATTR_API_UV_INDEX,
name="UV Index", name="UV Index",
native_unit_of_measurement=UV_INDEX, native_unit_of_measurement=UV_INDEX,
state_class=STATE_CLASS_MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_CONDITION, key=ATTR_API_CONDITION,
@ -274,24 +271,24 @@ FORECAST_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
key=ATTR_FORECAST_PRESSURE, key=ATTR_FORECAST_PRESSURE,
name="Pressure", name="Pressure",
native_unit_of_measurement=PRESSURE_HPA, native_unit_of_measurement=PRESSURE_HPA,
device_class=DEVICE_CLASS_PRESSURE, device_class=SensorDeviceClass.PRESSURE,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_FORECAST_TEMP, key=ATTR_FORECAST_TEMP,
name="Temperature", name="Temperature",
native_unit_of_measurement=TEMP_CELSIUS, native_unit_of_measurement=TEMP_CELSIUS,
device_class=DEVICE_CLASS_TEMPERATURE, device_class=SensorDeviceClass.TEMPERATURE,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_FORECAST_TEMP_LOW, key=ATTR_FORECAST_TEMP_LOW,
name="Temperature Low", name="Temperature Low",
native_unit_of_measurement=TEMP_CELSIUS, native_unit_of_measurement=TEMP_CELSIUS,
device_class=DEVICE_CLASS_TEMPERATURE, device_class=SensorDeviceClass.TEMPERATURE,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_FORECAST_TIME, key=ATTR_FORECAST_TIME,
name="Time", name="Time",
device_class=DEVICE_CLASS_TIMESTAMP, device_class=SensorDeviceClass.TIMESTAMP,
), ),
SensorEntityDescription( SensorEntityDescription(
key=ATTR_API_WIND_BEARING, key=ATTR_API_WIND_BEARING,

7
homeassistant/components/openweathermap/sensor.py
View file

@ -4,7 +4,7 @@ from __future__ import annotations
from datetime import datetime from datetime import datetime
from homeassistant.components.sensor import ( from homeassistant.components.sensor import (
DEVICE_CLASS_TIMESTAMP, SensorDeviceClass,
SensorEntity, SensorEntity,
SensorEntityDescription, SensorEntityDescription,
) )
@ -157,7 +157,10 @@ class OpenWeatherMapForecastSensor(AbstractOpenWeatherMapSensor):
return None return None
value = forecasts[0].get(self.entity_description.key, None) value = forecasts[0].get(self.entity_description.key, None)
if value and self.entity_description.device_class == DEVICE_CLASS_TIMESTAMP: if (
value
and self.entity_description.device_class is SensorDeviceClass.TIMESTAMP
):
return dt_util.parse_datetime(value) return dt_util.parse_datetime(value)
return value return value