Upgrade syntax for Python 3.9+

Author: RealOrangeOne

django_tasks/backends/base.py

@@ -1,6 +1,7 @@
 from abc import ABCMeta, abstractmethod
+from collections.abc import Iterable
 from inspect import iscoroutinefunction
-from typing import Any, Iterable, TypeVar
+from typing import Any, TypeVar
 
 from asgiref.sync import sync_to_async
 from django.core.checks import messages

django_tasks/backends/database/admin.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Optional
 
 from django.contrib import admin
 from django.http import HttpRequest
@@ -38,5 +38,5 @@ def has_change_permission(
 
     def get_readonly_fields(
         self, request: HttpRequest, obj: Optional[DBTaskResult] = None
-    ) -> List[str]:
+    ) -> list[str]:
         return [f.name for f in self.model._meta.fields]

django_tasks/backends/database/backend.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Iterable, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 import django
 from django.apps import apps

django_tasks/backends/database/management/commands/db_worker.py

@@ -6,7 +6,7 @@
 import time
 from argparse import ArgumentParser, ArgumentTypeError
 from types import FrameType
-from typing import List, Optional
+from typing import Optional
 
 from django.core.exceptions import SuspiciousOperation
 from django.core.management.base import BaseCommand
@@ -29,7 +29,7 @@ class Worker:
     def __init__(
         self,
         *,
-        queue_names: List[str],
+        queue_names: list[str],
         interval: float,
         batch: bool,
         backend_name: str,

django_tasks/backends/database/utils.py

@@ -1,5 +1,6 @@
+from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Any, Generator, Optional, Union
+from typing import Any, Optional, Union
 from uuid import UUID
 
 import django

django_tasks/backends/dummy.py

@@ -1,6 +1,6 @@
 from copy import deepcopy
 from functools import partial
-from typing import List, TypeVar
+from typing import TypeVar
 
 from django.db import transaction
 from django.utils import timezone
@@ -20,7 +20,7 @@
 class DummyBackend(BaseTaskBackend):
     supports_defer = True
     supports_async_task = True
-    results: List[TaskResult]
+    results: list[TaskResult]
 
     def __init__(self, alias: str, params: dict) -> None:
         super().__init__(alias, params)

django_tasks/checks.py

@@ -1,4 +1,5 @@
-from typing import Any, Iterable, Sequence
+from collections.abc import Iterable, Sequence
+from typing import Any
 
 from django.apps.config import AppConfig
 from django.core.checks.messages import CheckMessage

django_tasks/signal_handlers.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Type
 
 from asgiref.local import Local
 from django.core.signals import setting_changed
@@ -26,7 +25,7 @@ def clear_tasks_handlers(*, setting: str, **kwargs: dict) -> None:
 
 @receiver(task_enqueued)
 def log_task_enqueued(
-    sender: Type[BaseTaskBackend], task_result: TaskResult, **kwargs: dict
+    sender: type[BaseTaskBackend], task_result: TaskResult, **kwargs: dict
 ) -> None:
     logger.debug(
         "Task id=%s path=%s enqueued backend=%s",
@@ -38,7 +37,7 @@ def log_task_enqueued(
 
 @receiver(task_finished)
 def log_task_finished(
-    sender: Type[BaseTaskBackend], task_result: TaskResult, **kwargs: dict
+    sender: type[BaseTaskBackend], task_result: TaskResult, **kwargs: dict
 ) -> None:
     if task_result.status == ResultStatus.FAILED:
         # Use `.exception` to integrate with error monitoring tools (eg Sentry)

django_tasks/task.py

@@ -5,10 +5,8 @@
     TYPE_CHECKING,
     Any,
     Callable,
-    Dict,
     Generic,
     Optional,
-    Type,
     TypeVar,
     Union,
     cast,
@@ -102,7 +100,7 @@ def using(
         Create a new task with modified defaults
         """
 
-        changes: Dict[str, Any] = {}
+        changes: dict[str, Any] = {}
 
         if priority is not None:
             changes["priority"] = priority
@@ -245,13 +243,13 @@ class TaskResult(Generic[T]):
     args: list
     """The arguments to pass to the task function"""
 
-    kwargs: Dict[str, Any]
+    kwargs: dict[str, Any]
     """The keyword arguments to pass to the task function"""
 
     backend: str
     """The name of the backend the task will run on"""
 
-    _exception_class: Optional[Type[BaseException]] = field(init=False, default=None)
+    _exception_class: Optional[type[BaseException]] = field(init=False, default=None)
     _traceback: Optional[str] = field(init=False, default=None)
 
     _return_value: Optional[T] = field(init=False, default=None)
@@ -270,7 +268,7 @@ def return_value(self) -> Optional[T]:
         return cast(T, self._return_value)
 
     @property
-    def exception_class(self) -> Optional[Type[BaseException]]:
+    def exception_class(self) -> Optional[type[BaseException]]:
         """The exception raised by the task function"""
         if not self.is_finished:
             raise ValueError("Task has not finished yet")

tests/tests/test_immediate_backend.py

@@ -71,9 +71,10 @@ def test_catches_exception(self) -> None:
             ),
         ]
         for task, exception, message in test_data:
-            with self.subTest(task), self.assertLogs(
-                "django_tasks", level="ERROR"
-            ) as captured_logs:
+            with (
+                self.subTest(task),
+                self.assertLogs("django_tasks", level="ERROR") as captured_logs,
+            ):
                 result = task.enqueue()
 
                 # assert logging