Use UTC compatible with py<3.12

Author: danielballan

tiled/adapters/mapping.py

@@ -4,7 +4,7 @@
 import operator
 import sys
 from collections import Counter
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -286,7 +286,7 @@ def metadata_stale_at(self) -> Optional[datetime]:
         """
         if self.metadata_stale_after is None:
             return None
-        return self.metadata_stale_after + datetime.now(UTC)
+        return self.metadata_stale_after + datetime.now(timezone.utc)
 
     @property
     def entries_stale_at(self) -> Optional[datetime]:
@@ -298,7 +298,7 @@ def entries_stale_at(self) -> Optional[datetime]:
         """
         if self.entries_stale_after is None:
             return None
-        return self.entries_stale_after + datetime.now(UTC)
+        return self.entries_stale_after + datetime.now(timezone.utc)
 
     def new_variation(
         self,

tiled/authn_database/core.py

@@ -1,6 +1,6 @@
 import hashlib
 import uuid as uuid_module
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
@@ -77,12 +77,12 @@ async def purge_expired(db, cls):
     """
     Remove expired entries.
     """
-    now = datetime.now(UTC)
+    now = datetime.now(timezone.utc)
     num_expired = 0
     statement = (
         select(cls)
         .filter(cls.expiration_time.is_not(None))
-        .filter(cls.expiration_time.replace(tzinfo=UTC) < now)
+        .filter(cls.expiration_time.replace(tzinfo=timezone.utc) < now)
     )
     result = await db.execute(statement)
     for obj in result.scalars():
@@ -145,8 +145,8 @@ async def lookup_valid_session(db, session_id):
     if session is None:
         return None
     if session.expiration_time is not None and session.expiration_time.replace(
-        tzinfo=UTC
-    ) < datetime.now(UTC):
+        tzinfo=timezone.utc
+    ) < datetime.now(timezone.utc):
         await db.delete(session)
         await db.commit()
         return None
@@ -170,7 +170,8 @@ async def lookup_valid_pending_session_by_device_code(db, device_code):
         return None
     if (
         pending_session.expiration_time is not None
-        and pending_session.expiration_time.replace(tzinfo=UTC) < datetime.now(UTC)
+        and pending_session.expiration_time.replace(tzinfo=timezone.utc)
+        < datetime.now(timezone.utc)
     ):
         await db.delete(pending_session)
         await db.commit()
@@ -188,7 +189,8 @@ async def lookup_valid_pending_session_by_user_code(db, user_code):
         return None
     if (
         pending_session.expiration_time is not None
-        and pending_session.expiration_time.replace(tzinfo=UTC) < datetime.now(UTC)
+        and pending_session.expiration_time.replace(tzinfo=timezone.utc)
+        < datetime.now(timezone.utc)
     ):
         await db.delete(pending_session)
         await db.commit()
@@ -227,7 +229,7 @@ async def lookup_valid_api_key(db, secret):
     Look up an API key. Ensure that it is valid.
     """
 
-    now = datetime.now(UTC)
+    now = datetime.now(timezone.utc)
     hashed_secret = hashlib.sha256(secret).digest()
     api_key = (
         await db.execute(
@@ -244,7 +246,7 @@ async def lookup_valid_api_key(db, secret):
         # No match
         validated_api_key = None
     elif (api_key.expiration_time is not None) and (
-        api_key.expiration_time.replace(tzinfo=UTC) < now
+        api_key.expiration_time.replace(tzinfo=timezone.utc) < now
     ):
         # Match is expired. Delete it.
         await db.delete(api_key)

tiled/server/authentication.py

@@ -3,7 +3,7 @@
 import secrets
 import uuid as uuid_module
 import warnings
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Optional
 
@@ -83,7 +83,7 @@
 
 def utcnow():
     "UTC now with second resolution"
-    return datetime.now(UTC).replace(microsecond=0)
+    return datetime.now(timezone.utc).replace(microsecond=0)
 
 
 class Mode(enum.Enum):
@@ -1041,7 +1041,7 @@ async def slide_session(refresh_token, settings, db):
     if (
         (session is None)
         or session.revoked
-        or (session.expiration_time.replace(tzinfo=UTC) < now)
+        or (session.expiration_time.replace(tzinfo=timezone.utc) < now)
     ):
         # Do not leak (to a potential attacker) whether this has been *revoked*
         # specifically. Give the same error as if it had expired.

tiled/server/core.py

@@ -8,7 +8,7 @@
 import types
 import uuid
 from collections import defaultdict
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from hashlib import md5
 from typing import Any
 
@@ -225,7 +225,7 @@ async def construct_entries_response(
             keys = tree.keys()[offset : offset + limit]  # noqa: E203
         items = [(key, None) for key in keys]
     # This value will not leak out. It just used to seed comparisons.
-    metadata_stale_at = datetime.now(UTC) + timedelta(days=1_000_000)
+    metadata_stale_at = datetime.now(timezone.utc) + timedelta(days=1_000_000)
     must_revalidate = getattr(tree, "must_revalidate", True)
     for key, entry in items:
         resource = await construct_resource(

tiled/server/router.py

@@ -3,7 +3,7 @@
 import os
 import re
 import warnings
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from functools import partial
 from pathlib import Path
 from typing import Any, List, Optional
@@ -151,7 +151,7 @@ async def about(
             },
             meta={"root_path": request.scope.get("root_path") or "" + "/api"},
         ).model_dump(),
-        expires=datetime.now(UTC) + timedelta(seconds=600),
+        expires=datetime.now(timezone.utc) + timedelta(seconds=600),
     )