diff --git a/homeassistant/components/season/sensor.py b/homeassistant/components/season/sensor.py index 80fb71f594b..197654f489f 100644 --- a/homeassistant/components/season/sensor.py +++ b/homeassistant/components/season/sensor.py @@ -1,14 +1,18 @@ """Support for tracking which astronomical or meteorological season it is.""" +from __future__ import annotations + from datetime import datetime import logging import ephem import voluptuous as vol -from homeassistant import util from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity from homeassistant.const import CONF_NAME, CONF_TYPE +from homeassistant.core import HomeAssistant import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity_platform import AddEntitiesCallback +from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from homeassistant.util.dt import utcnow _LOGGER = logging.getLogger(__name__) @@ -53,19 +57,19 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( ) -def setup_platform(hass, config, add_entities, discovery_info=None): +def setup_platform( + hass: HomeAssistant, + config: ConfigType, + add_entities: AddEntitiesCallback, + discovery_info: DiscoveryInfoType | None = None, +) -> None: """Display the current season.""" - if None in (hass.config.latitude, hass.config.longitude): - _LOGGER.error("Latitude or longitude not set in Home Assistant config") - return False - - latitude = util.convert(hass.config.latitude, float) _type = config.get(CONF_TYPE) name = config.get(CONF_NAME) - if latitude < 0: + if hass.config.latitude < 0: hemisphere = SOUTHERN - elif latitude > 0: + elif hass.config.latitude > 0: hemisphere = NORTHERN else: hemisphere = EQUATOR @@ -73,8 +77,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None): _LOGGER.debug(_type) add_entities([Season(hass, hemisphere, _type, name)], True) - return True - def get_season(date, hemisphere, season_tracking_type): """Calculate the current season.""" diff --git a/tests/components/season/test_sensor.py b/tests/components/season/test_sensor.py index d1c6cfb0b9f..7e673832121 100644 --- a/tests/components/season/test_sensor.py +++ b/tests/components/season/test_sensor.py @@ -16,17 +16,17 @@ from homeassistant.const import STATE_UNKNOWN from homeassistant.setup import async_setup_component HEMISPHERE_NORTHERN = { - "homeassistant": {"latitude": "48.864716", "longitude": "2.349014"}, + "homeassistant": {"latitude": 48.864716, "longitude": 2.349014}, "sensor": {"platform": "season", "type": "astronomical"}, } HEMISPHERE_SOUTHERN = { - "homeassistant": {"latitude": "-33.918861", "longitude": "18.423300"}, + "homeassistant": {"latitude": -33.918861, "longitude": 18.423300}, "sensor": {"platform": "season", "type": "astronomical"}, } HEMISPHERE_EQUATOR = { - "homeassistant": {"latitude": "0", "longitude": "-51.065100"}, + "homeassistant": {"latitude": 0, "longitude": -51.065100}, "sensor": {"platform": "season", "type": "astronomical"}, }