Fix Python 3.10 compatibility

Author: O2eg

src/pg_stand/cli.py

@@ -8,7 +8,7 @@
 import sys
 import time
 from collections.abc import Sequence
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Any
 
 import yaml
@@ -39,7 +39,7 @@ def _emit_stream(value: Any, *, as_json: bool) -> None:
 
 
 def _moment(value: str, *, now: datetime | None = None) -> datetime:
-    reference = now or datetime.now(UTC)
+    reference = now or datetime.now(timezone.utc)
     match = _DURATION_RE.fullmatch(value.strip().lower())
     if match:
         factors = {"s": 1, "m": 60, "h": 3600, "d": 86400}
@@ -52,8 +52,8 @@ def _moment(value: str, *, now: datetime | None = None) -> datetime:
             f"invalid time {value!r}; use an ISO-8601 timestamp or duration such as 30m"
         ) from exc
     if parsed.tzinfo is None:
-        parsed = parsed.replace(tzinfo=UTC)
-    return parsed.astimezone(UTC)
+        parsed = parsed.replace(tzinfo=timezone.utc)
+    return parsed.astimezone(timezone.utc)
 
 
 def _health_options(args: argparse.Namespace) -> dict[str, Any]:
@@ -227,7 +227,7 @@ def _execute(args: argparse.Namespace, config: StandConfig) -> int:
         elif args.format == "raw" and args.node != "all" and not has_filters and not args.json:
             manager.logs(args.node, tail=args.tail)
         else:
-            now = datetime.now(UTC)
+            now = datetime.now(timezone.utc)
             records = manager.log_records(
                 args.node,
                 tail=args.tail,
@@ -244,7 +244,7 @@ def _execute(args: argparse.Namespace, config: StandConfig) -> int:
     elif args.command == "events":
         if args.follow and args.until:
             raise DockerRuntimeError("events --follow cannot be combined with --until")
-        now = datetime.now(UTC)
+        now = datetime.now(timezone.utc)
         since = int(_moment(args.since, now=now).timestamp())
         until = (
             None

src/pg_stand/runtime_nodes.py

@@ -8,7 +8,7 @@
 import shutil
 import subprocess
 from dataclasses import asdict
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any
 from urllib.parse import quote, urlencode
 
@@ -414,13 +414,17 @@ def _log_timestamp(value: str) -> datetime | None:
         text = value.strip()
         if text.endswith(" UTC"):
             text = text[:-4] + "+00:00"
+        elif len(text) >= 3 and text[-3] in "+-" and text[-2:].isdigit():
+            # PostgreSQL can emit a whole-hour offset such as +00. Python 3.10
+            # requires the equivalent ISO 8601 form with explicit minutes.
+            text += ":00"
         try:
             parsed = datetime.fromisoformat(text.replace(" ", "T", 1))
         except ValueError:
             return None
         if parsed.tzinfo is None:
-            return parsed.replace(tzinfo=UTC)
-        return parsed.astimezone(UTC)
+            return parsed.replace(tzinfo=timezone.utc)
+        return parsed.astimezone(timezone.utc)
 
     def log_records(
         self,
@@ -478,7 +482,7 @@ def log_records(
                 ).casefold()
                 if needle not in haystack:
                     continue
-            record["_timestamp"] = timestamp or datetime.min.replace(tzinfo=UTC)
+            record["_timestamp"] = timestamp or datetime.min.replace(tzinfo=timezone.utc)
             filtered.append(record)
         filtered.sort(key=lambda item: (item["_timestamp"], item["node"], item["session_id"]))
         if tail >= 0:

src/pg_stand/runtime_observe.py

@@ -4,7 +4,7 @@
 
 import time
 from dataclasses import asdict
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any
 
 from pg_stand.config import NodeConfig
@@ -615,7 +615,7 @@ def health(
             "project": self.config.metadata.name,
             "status": level,
             "exit_code": {"healthy": 0, "degraded": 1, "unavailable": 2}[level],
-            "checked_at": datetime.now(UTC).isoformat(),
+            "checked_at": datetime.now(timezone.utc).isoformat(),
             "checks": checks,
         }
 
@@ -721,7 +721,7 @@ def docker_events(
             if name and not name.endswith(MANAGED_RESOURCE_SUFFIX):
                 continue
             yield {
-                "time": datetime.fromtimestamp(int(event.get("time", 0)), UTC).isoformat(),
+                "time": datetime.fromtimestamp(int(event.get("time", 0)), timezone.utc).isoformat(),
                 "type": event.get("Type"),
                 "action": event.get("Action") or event.get("status"),
                 "id": event.get("id") or actor.get("ID"),
@@ -735,7 +735,7 @@ def docker_events(
 
     def overview(self) -> dict[str, Any]:
         result: dict[str, Any] = {
-            "observed_at": datetime.now(UTC).isoformat(),
+            "observed_at": datetime.now(timezone.utc).isoformat(),
             "status": self.status(),
             "resources": self.resources(),
         }

tests/test_cli.py

@@ -160,11 +160,11 @@ def test_new_observation_and_management_command_shapes() -> None:
 
 
 def test_relative_and_iso_times_are_supported() -> None:
-    from datetime import UTC, datetime
+    from datetime import datetime, timezone
 
-    now = datetime(2026, 7, 17, 12, 0, tzinfo=UTC)
+    now = datetime(2026, 7, 17, 12, 0, tzinfo=timezone.utc)
 
-    assert _moment("30m", now=now) == datetime(2026, 7, 17, 11, 30, tzinfo=UTC)
+    assert _moment("30m", now=now) == datetime(2026, 7, 17, 11, 30, tzinfo=timezone.utc)
     assert _moment("2026-07-17T14:00:00+02:00") == now
 
 

tests/test_runtime.py

@@ -2,7 +2,7 @@
 
 import json
 from dataclasses import replace
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from types import SimpleNamespace
 from unittest.mock import MagicMock, call, patch
@@ -894,6 +894,21 @@ def test_pgbouncer_has_separate_pool_modes_and_certificate_only_tls() -> None:
     assert "hostssl all all all cert map=pg_stand_tls" in script
 
 
+@pytest.mark.parametrize(
+    ("value", "expected"),
+    [
+        ("2026-07-17 12:01:00+00", "2026-07-17T12:01:00+00:00"),
+        ("2026-07-17 15:01:00+03", "2026-07-17T12:01:00+00:00"),
+        ("2026-07-17 12:01:00 UTC", "2026-07-17T12:01:00+00:00"),
+    ],
+)
+def test_log_timestamp_accepts_postgresql_timezone_formats(value: str, expected: str) -> None:
+    parsed = StandManager._log_timestamp(value)
+
+    assert parsed is not None
+    assert parsed.isoformat() == expected
+
+
 def test_log_records_merge_sort_and_filter() -> None:
     config = load_config(ASSET_ROOT / "configs" / "primary-standby-sync.yaml", environment={})
     manager = StandManager(config, client=object())
@@ -931,7 +946,7 @@ def test_log_records_merge_sort_and_filter() -> None:
     with patch.object(manager, "_csv_log_records", side_effect=lambda node: rows[node]):
         result = manager.log_records(
             "all",
-            since=datetime(2026, 7, 17, 12, 0, 30, tzinfo=UTC),
+            since=datetime(2026, 7, 17, 12, 0, 30, tzinfo=timezone.utc),
             severity="error",
             contains="target",
         )