diff --git a/django/tasks/__init__.py b/django/tasks/__init__.py index a57f284a98..31a12f9890 100644 --- a/django/tasks/__init__.py +++ b/django/tasks/__init__.py @@ -2,13 +2,11 @@ from django.utils.connection import BaseConnectionHandler, ConnectionProxy from django.utils.module_loading import import_string from . import checks, signal_handlers # noqa -from .backends.base import BaseTaskBackend from .exceptions import InvalidTaskBackendError from .task import ( DEFAULT_QUEUE_NAME, DEFAULT_TASK_BACKEND_ALIAS, ResultStatus, - Task, TaskResult, task, ) @@ -19,7 +17,6 @@ __all__ = [ "DEFAULT_QUEUE_NAME", "task", "ResultStatus", - "Task", "TaskResult", ] @@ -48,6 +45,4 @@ class TasksHandler(BaseConnectionHandler): tasks = TasksHandler() -default_task_backend: BaseTaskBackend = ConnectionProxy( - tasks, DEFAULT_TASK_BACKEND_ALIAS -) +default_task_backend = ConnectionProxy(tasks, DEFAULT_TASK_BACKEND_ALIAS) diff --git a/django/tasks/backends/base.py b/django/tasks/backends/base.py index 4555103a8f..d35e16d80f 100644 --- a/django/tasks/backends/base.py +++ b/django/tasks/backends/base.py @@ -5,6 +5,7 @@ from asgiref.sync import sync_to_async from django.core.checks import messages from django.db import connections +from django.tasks import DEFAULT_QUEUE_NAME from django.tasks.exceptions import InvalidTaskError from django.tasks.task import MAX_PRIORITY, MIN_PRIORITY, Task from django.tasks.utils import is_global_function @@ -25,8 +26,6 @@ class BaseTaskBackend(metaclass=ABCMeta): """Can results be retrieved after the fact (from **any** thread / process)""" def __init__(self, options): - from django.tasks import DEFAULT_QUEUE_NAME - self.alias = options["ALIAS"] self.queues = set(options.get("QUEUES", [DEFAULT_QUEUE_NAME])) self.enqueue_on_commit = bool(options.get("ENQUEUE_ON_COMMIT", True)) diff --git a/tests/tasks/test_dummy_backend.py b/tests/tasks/test_dummy_backend.py index 75a7f9020f..3871dd51c9 100644 --- a/tests/tasks/test_dummy_backend.py +++ b/tests/tasks/test_dummy_backend.py @@ -1,9 +1,10 @@ from typing import cast from django.db import transaction -from django.tasks import ResultStatus, Task, default_task_backend, tasks +from django.tasks import ResultStatus, default_task_backend, tasks from django.tasks.backends.dummy import DummyBackend from django.tasks.exceptions import ResultDoesNotExist +from django.tasks.task import Task from django.test import SimpleTestCase, TransactionTestCase, override_settings from . import tasks as test_tasks diff --git a/tests/tasks/test_immediate_backend.py b/tests/tasks/test_immediate_backend.py index 822414742e..3294023d69 100644 --- a/tests/tasks/test_immediate_backend.py +++ b/tests/tasks/test_immediate_backend.py @@ -1,9 +1,10 @@ from typing import cast from django.db import transaction -from django.tasks import ResultStatus, Task, default_task_backend, tasks +from django.tasks import ResultStatus, default_task_backend, tasks from django.tasks.backends.immediate import ImmediateBackend from django.tasks.exceptions import InvalidTaskError +from django.tasks.task import Task from django.test import SimpleTestCase, TransactionTestCase, override_settings from django.utils import timezone diff --git a/tests/tasks/test_tasks.py b/tests/tasks/test_tasks.py index ef458a7173..180d77f7bd 100644 --- a/tests/tasks/test_tasks.py +++ b/tests/tasks/test_tasks.py @@ -4,7 +4,6 @@ from datetime import datetime, timedelta from django.tasks import ( DEFAULT_QUEUE_NAME, ResultStatus, - Task, default_task_backend, task, tasks, @@ -16,7 +15,7 @@ from django.tasks.exceptions import ( InvalidTaskError, ResultDoesNotExist, ) -from django.tasks.task import MAX_PRIORITY, MIN_PRIORITY +from django.tasks.task import MAX_PRIORITY, MIN_PRIORITY, Task from django.test import SimpleTestCase, override_settings from django.utils import timezone from django.utils.module_loading import import_string