Merge pull request #48 from chemelli74/chemelli74-rework-uptime

fix: add timezone to convert_uptime function

library_test.py

@@ -80,7 +80,7 @@ async def main() -> None:
     print("Serial #:", data["sys_serial_number"])
     print("Firmware:", data["sys_firmware_version"])
     print("Hardware:", data["sys_hardware_version"])
-    print("Uptime  :", await api.convert_uptime(data["sys_uptime"]))
+    print("Uptime  :", api.convert_uptime(data["sys_uptime"]))
     print("-" * 20)
     print("Logout & close session")
     await api.logout()

src/aiovodafone/api.py

@@ -6,7 +6,7 @@
 import urllib.parse
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from http.cookies import SimpleCookie
 from typing import Any
 
@@ -99,7 +99,7 @@ async def _get_page_result(self, page: str) -> aiohttp.ClientResponse:
         )
 
     @abstractmethod
-    async def convert_uptime(self, uptime: str) -> datetime:
+    def convert_uptime(self, uptime: str) -> datetime:
         pass
 
     async def close(self) -> None:
@@ -238,8 +238,10 @@ async def get_sensor_data(self) -> dict[Any, Any]:
         data["sys_uptime"] = status_json["data"]["uptime"]
         return data
 
-    async def convert_uptime(self, uptime: str) -> datetime:
-        return datetime.utcnow() - timedelta(seconds=int(uptime))
+    def convert_uptime(self, uptime: str) -> datetime:
+        return datetime.utcnow().replace(tzinfo=timezone.utc) - timedelta(
+            seconds=int(uptime)
+        )
 
     async def logout(self) -> None:
         # Logout
@@ -446,13 +448,15 @@ async def get_devices_data(self) -> dict[str, VodafoneStationDevice]:
 
         return self._devices
 
-    async def convert_uptime(self, uptime: str) -> datetime:
+    def convert_uptime(self, uptime: str) -> datetime:
         """Convert router uptime to last boot datetime."""
         d = int(uptime.split(":")[0])
         h = int(uptime.split(":")[1])
         m = int(uptime.split(":")[2])
 
-        return datetime.utcnow() - timedelta(days=d, hours=h, minutes=m)
+        return datetime.utcnow().replace(tzinfo=timezone.utc) - timedelta(
+            days=d, hours=h, minutes=m
+        )
 
     async def login(self) -> bool:
         """Router login."""