Merge pull request #24 from msamsami/fix-python39-310-compatibility

fix Python 3.9 and 3.10 compatibility issues

Author: igorbenav

crudadmin/admin_interface/admin_site.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import AsyncGenerator, Callable
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional, cast
 
 from fastapi import APIRouter, Cookie, Depends, Request, Response
@@ -19,6 +19,8 @@
 from .auth import AdminAuthentication
 from .typing import RouteResponse
 
+UTC = timezone.utc
+
 logger = logging.getLogger(__name__)
 
 EndpointCallable = Callable[..., Any]

crudadmin/admin_interface/crud_admin.py

@@ -1,22 +1,27 @@
 import logging
 import os
+import sys
 import time
 from collections.abc import Awaitable, Callable
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import (
     Any,
     AsyncGenerator,
     Dict,
     List,
     Optional,
     Type,
-    TypeAlias,
     TypedDict,
     TypeVar,
     Union,
     cast,
 )
 
+if sys.version_info >= (3, 10):
+    from typing import TypeAlias
+else:
+    from typing_extensions import TypeAlias
+
 from fastapi import APIRouter, Depends, FastAPI, Request
 from fastapi.security import OAuth2PasswordBearer
 from fastapi.staticfiles import StaticFiles
@@ -43,6 +48,8 @@
 from .model_view import ModelView
 from .typing import RouteResponse
 
+UTC = timezone.utc
+
 logger = logging.getLogger("crudadmin")
 
 ModelType = TypeVar("ModelType", bound=DeclarativeBase)

crudadmin/admin_user/models.py

@@ -1,9 +1,11 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Optional, Type
 
 from sqlalchemy import Boolean, DateTime, String
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
+UTC = timezone.utc
+
 
 def create_admin_user(base: Type[DeclarativeBase]) -> Type[DeclarativeBase]:
     class AdminUser(base):  # type: ignore

crudadmin/core/schemas/timestamp.py

@@ -1,23 +1,25 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any, Optional
 
 from pydantic import BaseModel, Field, field_serializer
 
+UTC = timezone.utc
+
 
 class TimestampSchema(BaseModel):
     created_at: datetime = Field(default_factory=lambda: datetime.now(UTC))
     updated_at: Optional[datetime] = Field(default=None)
 
     @field_serializer("created_at")
-    def serialize_dt(self, created_at: datetime | None, _info: Any) -> str | None:
+    def serialize_dt(self, created_at: Optional[datetime], _info: Any) -> Optional[str]:
         if created_at is not None:
             return created_at.isoformat()
         return None
 
     @field_serializer("updated_at")
     def serialize_updated_at(
-        self, updated_at: datetime | None, _info: Any
-    ) -> str | None:
+        self, updated_at: Optional[datetime], _info: Any
+    ) -> Optional[str]:
         if updated_at is not None:
             return updated_at.isoformat()
         return None

crudadmin/event/decorators.py

@@ -1,7 +1,7 @@
 import functools
 import logging
 from collections.abc import Callable
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional, Type
 
 from fastapi import Request
@@ -11,6 +11,8 @@
 
 from .models import EventType
 
+UTC = timezone.utc
+
 logger = logging.getLogger(__name__)
 
 

crudadmin/event/models.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any, Optional, cast
 
 from sqlalchemy import JSON, DateTime, String
@@ -7,6 +7,8 @@
 
 from .schemas import EventStatus, EventType
 
+UTC = timezone.utc
+
 
 def create_admin_event_log(base: type[DeclarativeBase]) -> type[DeclarativeBase]:
     tablename = "admin_event_log"

crudadmin/event/service.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 from enum import Enum
 from typing import Any, Optional, cast
@@ -19,6 +19,8 @@
     EventType,
 )
 
+UTC = timezone.utc
+
 logger = logging.getLogger(__name__)
 
 

crudadmin/session/backends/database.py

@@ -6,7 +6,7 @@
 """
 
 import logging
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any, Optional, TypeVar
 
 from pydantic import BaseModel
@@ -16,6 +16,8 @@
 from ..schemas import AdminSessionCreate, AdminSessionUpdate
 from ..storage import AbstractSessionStorage
 
+UTC = timezone.utc
+
 T = TypeVar("T", bound=BaseModel)
 logger = logging.getLogger(__name__)
 

crudadmin/session/backends/memory.py

@@ -1,13 +1,15 @@
 import json
 import logging
 import re
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Optional, Pattern, TypeVar
 
 from pydantic import BaseModel
 
 from ..storage import AbstractSessionStorage
 
+UTC = timezone.utc
+
 T = TypeVar("T", bound=BaseModel)
 logger = logging.getLogger(__name__)
 

crudadmin/session/manager.py

@@ -1,6 +1,6 @@
 import logging
 import secrets
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Any, Literal, Optional
 
 from fastapi import Request, Response
@@ -10,6 +10,8 @@
 from .storage import AbstractSessionStorage, get_session_storage
 from .user_agents_types import parse
 
+UTC = timezone.utc
+
 logger = logging.getLogger(__name__)
 
 SamesiteType = Literal["lax", "strict", "none"]