fix: revert use of dt.UTC to dt.tz.UTC

some instance still on python 3.9

app/api/__init__.py

@@ -2,7 +2,7 @@ import base64
 import binascii
 import logging
 import re
-from datetime import datetime, timedelta, UTC
+from datetime import datetime, timedelta, timezone
 from typing import Optional, List, Callable, Any, Type, Dict, Union, Literal
 
 from flask import Blueprint, request, jsonify, abort
@@ -182,7 +182,7 @@ def list_origins() -> ResponseReturnValue:
 def list_mirrors() -> ResponseReturnValue:
     filters = []
 
-    twenty_four_hours_ago = datetime.now(UTC) - timedelta(hours=24)
+    twenty_four_hours_ago = datetime.now(timezone.utc) - timedelta(hours=24)
     status_filter = request.args.get('Status')
     if status_filter:
         if status_filter == "pending":

app/portal/pool.py

@@ -1,6 +1,6 @@
 import logging
 import secrets
-from datetime import datetime, UTC
+from datetime import datetime, timezone
 
 from flask import render_template, url_for, flash, redirect, Response, Blueprint
 from flask.typing import ResponseReturnValue
@@ -56,8 +56,8 @@ def pool_new() -> ResponseReturnValue:
         pool.description = form.description.data
         pool.redirector_domain = form.redirector_domain.data if form.redirector_domain.data != "" else None
         pool.api_key = secrets.token_urlsafe(nbytes=32)
-        pool.added = datetime.now(UTC)
+        pool.added = datetime.now(timezone.utc)
-        pool.updated = datetime.now(UTC)
+        pool.updated = datetime.now(timezone.utc)
         try:
             db.session.add(pool)
             db.session.commit()
@@ -88,7 +88,7 @@ def pool_edit(pool_id: int) -> ResponseReturnValue:
         if form.api_key.data != pool.api_key:
             pool.api_key = secrets.token_urlsafe(nbytes=32)
             form.api_key.data = pool.api_key
-        pool.updated = datetime.now(UTC)
+        pool.updated = datetime.now(timezone.utc)
         try:
             db.session.commit()
             flash("Saved changes to pool.", "success")

app/terraform/proxy/__init__.py

@@ -27,12 +27,12 @@ def update_smart_proxy_instance(group_id: int,
     ).first()
     if instance is None:
         instance = SmartProxy()
-        instance.added = datetime.datetime.now(datetime.UTC)
+        instance.added = datetime.datetime.now(datetime.timezone.utc)
         instance.group_id = group_id
         instance.provider = provider
         instance.region = region
         db.session.add(instance)
-    instance.updated = datetime.datetime.now(datetime.UTC)
+    instance.updated = datetime.datetime.now(datetime.timezone.utc)
     instance.instance_id = instance_id
 
 

app/terraform/proxy/meta.py

@@ -155,7 +155,7 @@ def auto_deprecate_proxies() -> None:
                        .all())
     logging.debug("Max age: %s", max_age_proxies)
     for proxy in max_age_proxies:
-        max_age_cutoff = datetime.datetime.now(datetime.UTC) - datetime.timedelta(
+        max_age_cutoff = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(
             days=1, seconds=86400 * random.random())  # nosec: B311
         if proxy.added < max_age_cutoff:
             proxy.deprecate(reason="max_age_reached")
@@ -168,7 +168,7 @@ def destroy_expired_proxies() -> None:
     This function finds all proxies that are not already destroyed and have been deprecated for more than 4 days.
     It then destroys these proxies.
     """
-    expiry_cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=4)
+    expiry_cutoff = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=4)
     proxies = Proxy.query.filter(
         Proxy.destroyed.is_(None),
         Proxy.deprecated < expiry_cutoff