Remove deprecated utcnow

Author: andrew-codechimp

custom_components/battery_notes/button.py

@@ -34,6 +34,7 @@
 from homeassistant.helpers.reload import async_setup_reload_service
 
 from . import PLATFORMS
+from .common import utcnow_no_timezone
 from .const import (
     ATTR_BATTERY_QUANTITY,
     ATTR_BATTERY_TYPE,
@@ -240,7 +241,7 @@ async def async_added_to_hass(self) -> None:
 
     async def async_press(self) -> None:
         """Press the button."""
-        self.coordinator.last_replaced = datetime.utcnow()
+        self.coordinator.last_replaced = utcnow_no_timezone()
 
         self.hass.bus.async_fire(
             EVENT_BATTERY_REPLACED,

custom_components/battery_notes/common.py

@@ -1,6 +1,9 @@
 """Common functions for battery_notes."""
 
+import datetime
+
 from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.util import dt as dt_util
 
 
 def validate_is_float(num):
@@ -13,6 +16,10 @@ def validate_is_float(num):
             return False
     return False
 
+def utcnow_no_timezone() -> datetime:
+    """Return UTC now without timezone information."""
+
+    return dt_util.utcnow().replace(tzinfo=None)
 
 def get_device_model_id(device_entry: DeviceEntry) -> str | None:
     """Get the device model if available."""

custom_components/battery_notes/coordinator.py

@@ -24,10 +24,9 @@
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from homeassistant.util import dt as dt_util
 from homeassistant.util.hass_dict import HassKey
 
-from .common import validate_is_float
+from .common import utcnow_no_timezone, validate_is_float
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LEVEL,
@@ -194,7 +193,7 @@ def __init__(
 
         # If there is not a last_reported set to now
         if not self.last_reported:
-            last_reported = datetime.utcnow()
+            last_reported = utcnow_no_timezone()
             _LOGGER.debug(
                 "Defaulting %s battery last reported to %s",
                 self.source_entity_id or self.device_id,
@@ -580,7 +579,7 @@ def current_battery_level(self, value):
                     _LOGGER.debug("battery_increased event fired")
 
         if self._current_battery_level not in [STATE_UNAVAILABLE, STATE_UNKNOWN]:
-            self.last_reported = dt_util.utcnow().replace(tzinfo=None)
+            self.last_reported = utcnow_no_timezone()
             self.last_reported_level = cast(float, self._current_battery_level)
             self._previous_battery_low = self.battery_low
             self._previous_battery_level = self._current_battery_level

custom_components/battery_notes/filters.py

@@ -3,10 +3,11 @@
 import logging
 import statistics
 from collections import Counter, deque
-from datetime import datetime, timedelta
+from datetime import timedelta
 from numbers import Number
 from typing import cast
 
+from .common import utcnow_no_timezone
 from .const import WINDOW_SIZE_UNIT_NUMBER_EVENTS, WINDOW_SIZE_UNIT_TIME
 
 _LOGGER = logging.getLogger(__name__)
@@ -19,7 +20,7 @@ class FilterState:
 
     def __init__(self, state: str | float | int) -> None:
         """Initialize with HA State object."""
-        self.timestamp = datetime.utcnow()
+        self.timestamp = utcnow_no_timezone()
         try:
             self.state = float(state)
         except ValueError:

custom_components/battery_notes/sensor.py

@@ -53,7 +53,7 @@
     CoordinatorEntity,
 )
 
-from .common import validate_is_float
+from .common import utcnow_no_timezone, validate_is_float
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LAST_REPORTED,
@@ -403,7 +403,7 @@ async def async_state_reported_listener(
 
         await self.coordinator.async_request_refresh()
 
-        self.coordinator.last_reported = datetime.utcnow()
+        self.coordinator.last_reported = utcnow_no_timezone()
 
         _LOGGER.debug(
             "Entity id %s has been reported.",

custom_components/battery_notes/services.py

@@ -13,6 +13,7 @@
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
 
+from .common import utcnow_no_timezone
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LAST_REPORTED,
@@ -59,7 +60,7 @@ async def handle_battery_replaced(call: ServiceCall) -> ServiceResponse:
                 tzinfo=None
             )
         else:
-            datetime_replaced = datetime.utcnow()
+            datetime_replaced = utcnow_no_timezone()
 
         entity_registry = er.async_get(hass)
         device_registry = dr.async_get(hass)
@@ -173,7 +174,7 @@ async def handle_battery_last_reported(call: ServiceCall) -> ServiceResponse:
 
             if coordinator.wrapped_battery and coordinator.last_reported:
                 time_since_lastreported = (
-                    datetime.fromisoformat(str(datetime.utcnow()) + "+00:00")
+                    datetime.fromisoformat(str(utcnow_no_timezone()) + "+00:00")
                     - coordinator.last_reported
                 )