python-tado 0.18.9__tar.gz → 0.18.11__tar.gz

{python_tado-0.18.9/python_tado.egg-info → python_tado-0.18.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python-tado
-Version: 0.18.9
+Version: 0.18.11
 Summary: PyTado from chrism0dwk, modfied by w.malgadey, diplix, michaelarnauts, LenhartStephan, splifter, syssi, andersonshatch, Yippy, p0thi, Coffee2CodeNL, chiefdragon, FilBr, nikilase, albertomontesg, Moritz-Schmidt, palazzem
 Author-email: Chris Jewell <chrism0dwk@gmail.com>, "w.malgadey" <w.malgadey@gmail.com>, FilBr <filippo.barba@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -707,6 +707,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: all
 Requires-Dist: python-tado[dev]; extra == "all"
+Dynamic: license-file
 
 # PyTado -- Pythonize your central heating
 

{python_tado-0.18.9 → python_tado-0.18.11}/PyTado/http.py

@@ -8,7 +8,7 @@ import logging
 import os
 import pprint
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from json import dump as json_dump
 from json import load as json_load
 from pathlib import Path
@@ -174,7 +174,7 @@ class Http:
         else:
             _LOGGER.setLevel(logging.WARNING)
 
-        self._refresh_at = datetime.now() + timedelta(minutes=10)
+        self._refresh_at = datetime.now(timezone.utc) + timedelta(minutes=10)
         self._session = http_session or self._create_session()
         self._session.hooks["response"].append(self._log_response)
         self._headers = {"Referer": "https://app.tado.com/"}
@@ -347,7 +347,7 @@ class Http:
         refresh_token = data["refresh_token"]
 
         self._token_refresh = refresh_token
-        self._refresh_at = datetime.now()
+        self._refresh_at = datetime.now(timezone.utc)
         self._refresh_at = self._refresh_at + timedelta(seconds=expires_in)
         # We subtract 30 seconds from the correct refresh time.
         # Then we have a 30 seconds timespan to get a new refresh_token
@@ -397,7 +397,7 @@ class Http:
                                            and force_refresh is False.
         """
 
-        if self._refresh_at >= datetime.now() and not force_refresh:
+        if self._refresh_at >= datetime.now(timezone.utc) and not force_refresh:
             return True
 
         url = "https://login.tado.com/oauth2/token"
@@ -504,7 +504,7 @@ class Http:
         _LOGGER.info("Please visit the following URL: %s", visit_url)
 
         expires_in_seconds = self._device_flow_data["expires_in"]
-        self._expires_at = datetime.now() + timedelta(seconds=expires_in_seconds)
+        self._expires_at = datetime.now(timezone.utc) + timedelta(seconds=expires_in_seconds)
 
         _LOGGER.info(
             "Waiting for user to authorize the device. Expires at %s",
@@ -514,7 +514,9 @@ class Http:
         return DeviceActivationStatus.PENDING
 
     def _check_device_activation(self) -> bool:
-        if self._expires_at is not None and datetime.timestamp(datetime.now()) > datetime.timestamp(self._expires_at):
+        if self._expires_at is not None and datetime.timestamp(datetime.now(timezone.utc)) > datetime.timestamp(
+            self._expires_at
+        ):
             raise TadoException("User took too long to enter key")
 
         # Await the desired interval, before polling the API again

{python_tado-0.18.9 → python_tado-0.18.11}/PyTado/interface/api/hops_tado.py

@@ -62,7 +62,7 @@ class TadoX(Tado):
         for device in devices:
             request = TadoXRequest()
             request.domain = Domain.DEVICES
-            request.device = device["serialNo"]
+            request.device = device["serialNumber"]
             device.update(self._http.request(request))
 
         if "otherDevices" in rooms_and_devices:

{python_tado-0.18.9 → python_tado-0.18.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-tado"
-version = "0.18.9"
+version = "0.18.11"
 description = "PyTado from chrism0dwk, modfied by w.malgadey, diplix, michaelarnauts, LenhartStephan, splifter, syssi, andersonshatch, Yippy, p0thi, Coffee2CodeNL, chiefdragon, FilBr, nikilase, albertomontesg, Moritz-Schmidt, palazzem"
 authors = [
     { name = "Chris Jewell", email = "chrism0dwk@gmail.com" },

{python_tado-0.18.9 → python_tado-0.18.11/python_tado.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python-tado
-Version: 0.18.9
+Version: 0.18.11
 Summary: PyTado from chrism0dwk, modfied by w.malgadey, diplix, michaelarnauts, LenhartStephan, splifter, syssi, andersonshatch, Yippy, p0thi, Coffee2CodeNL, chiefdragon, FilBr, nikilase, albertomontesg, Moritz-Schmidt, palazzem
 Author-email: Chris Jewell <chrism0dwk@gmail.com>, "w.malgadey" <w.malgadey@gmail.com>, FilBr <filippo.barba@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -707,6 +707,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: all
 Requires-Dist: python-tado[dev]; extra == "all"
+Dynamic: license-file
 
 # PyTado -- Pythonize your central heating
 

{python_tado-0.18.9 → python_tado-0.18.11}/tests/test_http.py

@@ -1,6 +1,6 @@
 """Test the Http class."""
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import io
 import json
 import unittest
@@ -151,7 +151,7 @@ class TestHttp(unittest.TestCase):
         )
 
         # Force token refresh
-        instance._refresh_at = datetime.now() - timedelta(seconds=1)
+        instance._refresh_at = datetime.now(timezone.utc) - timedelta(seconds=1)
         instance._refresh_token()
 
         assert refresh_token.call_count == 1
@@ -174,7 +174,7 @@ class TestHttp(unittest.TestCase):
         )
 
         # Force token refresh
-        instance._refresh_at = datetime.now() - timedelta(seconds=1)
+        instance._refresh_at = datetime.now(timezone.utc) - timedelta(seconds=1)
 
         with self.assertRaises(TadoException):
             instance._refresh_token()
@@ -221,7 +221,7 @@ class TestHttp(unittest.TestCase):
 
         http = Http()
         http._device_flow_data = {"interval": 5, "device_code": "mock_code"}
-        http._expires_at = datetime.now() + timedelta(minutes=5)
+        http._expires_at = datetime.now(timezone.utc) + timedelta(minutes=5)
 
         result = http._check_device_activation()
         self.assertTrue(result)