From b03ffe6a6ace990486e1657c8a05432acd4c76fe Mon Sep 17 00:00:00 2001 From: Michael Arthur Date: Fri, 25 Aug 2023 07:57:52 +1200 Subject: [PATCH] Electric Kiwi: Fix time for installations in UTC (#97881) --- homeassistant/components/electric_kiwi/sensor.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/electric_kiwi/sensor.py b/homeassistant/components/electric_kiwi/sensor.py index a3943437d4f..8c983b92dd5 100644 --- a/homeassistant/components/electric_kiwi/sensor.py +++ b/homeassistant/components/electric_kiwi/sensor.py @@ -46,16 +46,18 @@ class ElectricKiwiHOPSensorEntityDescription( def _check_and_move_time(hop: Hop, time: str) -> datetime: """Return the time a day forward if HOP end_time is in the past.""" date_time = datetime.combine( - datetime.today(), + dt_util.start_of_local_day(), datetime.strptime(time, "%I:%M %p").time(), - ).astimezone(dt_util.DEFAULT_TIME_ZONE) + dt_util.DEFAULT_TIME_ZONE, + ) end_time = datetime.combine( - datetime.today(), + dt_util.start_of_local_day(), datetime.strptime(hop.end.end_time, "%I:%M %p").time(), - ).astimezone(dt_util.DEFAULT_TIME_ZONE) + dt_util.DEFAULT_TIME_ZONE, + ) - if end_time < datetime.now().astimezone(dt_util.DEFAULT_TIME_ZONE): + if end_time < dt_util.now(): return date_time + timedelta(days=1) return date_time