Replace datetime.timezone.utc with datetime.UTC

Author: dolfinus

syncmaster/db/mixins/timestamp.py

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-present MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from functools import partial
 
 from sqlalchemy import DateTime, func
@@ -12,6 +12,6 @@ class TimestampMixin:
     updated_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         server_default=func.now(),
-        onupdate=partial(datetime.now, tz=timezone.utc),
+        onupdate=partial(datetime.now, tz=UTC),
         nullable=False,
     )

syncmaster/db/repositories/queue.py

@@ -129,8 +129,7 @@ async def get_group_permission(self, user: User, group_id: int) -> Permission:
             # If the user is not in the group, then he is either a superuser or does not have any rights
             if not user.is_superuser:
                 return Permission.NONE
-            else:
-                return Permission.DELETE
+            return Permission.DELETE
 
         group_role = user_group.role
 
@@ -139,7 +138,7 @@ async def get_group_permission(self, user: User, group_id: int) -> Permission:
 
         return Permission.DELETE
 
-    async def get_resource_permission(self, user: User, resource_id: int) -> Permission:  # noqa: WPS212
+    async def get_resource_permission(self, user: User, resource_id: int) -> Permission:
         """
         Method for determining CRUD rights in a repository (self.model) for a resource
         'DEVELOPER' does not have WRITE permission in the QUEUE repository

syncmaster/db/utils.py

@@ -21,7 +21,7 @@ def __init__(self, items: Sequence[Any], page: int, page_size: int, total: int)
         self.has_next = previous_items + len(items) < total
         if self.has_next:
             self.next_page = page + 1
-        self.pages = int(math.ceil(total / float(page_size))) or 1
+        self.pages = math.ceil(total / float(page_size)) or 1
 
 
 class Permission(IntEnum):

syncmaster/worker/transfer.py

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-present MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from asgi_correlation_id import correlation_id
 from asgi_correlation_id.extensions.celery import load_correlation_ids
@@ -63,7 +63,7 @@ def run_transfer(run_id: int, engine: Engine, settings: WorkerAppSettings):
 
             logger.info("Starting run %r", run_id)
             run.status = Status.STARTED
-            run.started_at = datetime.now(tz=timezone.utc)
+            run.started_at = datetime.now(tz=UTC)
             run.log_url = Template(settings.worker.log_url_template).render(
                 run=run,
                 correlation_id=correlation_id.get(),
@@ -94,7 +94,7 @@ def run_transfer(run_id: int, engine: Engine, settings: WorkerAppSettings):
         if run:
             logger.info("Updating run %r status in DB", run_id)
             run.status = status
-            run.ended_at = datetime.now(tz=timezone.utc)
+            run.ended_at = datetime.now(tz=UTC)
             session.commit()
 
     if exception is not None:

tests/resources/file_df_connection/generate_data.py

@@ -4,7 +4,7 @@
 
 import sys
 from argparse import ArgumentParser
-from datetime import timezone
+from datetime import UTC
 
 from faker import Faker
 
@@ -19,7 +19,7 @@ def create_data(elements: int) -> list[dict]:
             "REGION": fake.city(),
             "NUMBER": i + 1,
             "BIRTH_DATE": fake.date_object(),
-            "REGISTERED_AT": fake.date_time(tzinfo=timezone.utc),
+            "REGISTERED_AT": fake.date_time(tzinfo=UTC),
             "ACCOUNT_BALANCE": fake.random_int() + (fake.random_int() / 10000),
         }
         for i in range(elements)

tests/test_integration/test_scheduler/test_task.py

@@ -1,5 +1,5 @@
 import time
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from sqlalchemy.orm import Session
 
@@ -16,13 +16,13 @@ def tick(self: WorkerTask, run_id: int) -> None:
         if run is None:
             raise RunNotFoundError
 
-        run.started_at = datetime.now(tz=timezone.utc)
+        run.started_at = datetime.now(tz=UTC)
         run.status = Status.STARTED
         session.add(run)
         session.commit()
 
         time.sleep(2)  # to make sure that previous status is handled in test
         run.status = Status.FINISHED
-        run.ended_at = datetime.now(tz=timezone.utc)
+        run.ended_at = datetime.now(tz=UTC)
         session.add(run)
         session.commit()

tests/utils.py

@@ -1,6 +1,6 @@
 import asyncio
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from pathlib import Path
 from typing import Any
 
@@ -112,7 +112,7 @@ async def get_run_on_end(
     token: str,
     timeout: int = 120,
 ) -> dict[str, Any]:
-    end_time = datetime.now(tz=timezone.utc).timestamp() + timeout
+    end_time = datetime.now(tz=UTC).timestamp() + timeout
     while True:
         logger.info("Waiting for end of run")
         response = await client.get(
@@ -126,8 +126,8 @@ async def get_run_on_end(
         if data["status"] in [Status.FINISHED, Status.FAILED]:
             return data
 
-        if datetime.now(tz=timezone.utc).timestamp() > end_time:
-            raise TimeoutError()
+        if datetime.now(tz=UTC).timestamp() > end_time:
+            raise TimeoutError
 
         await asyncio.sleep(1)