From 673f061ee27f09909b9f5b76a38f3f8828083c5f Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 4 Oct 2024 12:54:44 +0100
Subject: [PATCH] Cleanup from first pass review

---
 django/tasks/__init__.py      | 8 +++-----
 django/tasks/backends/base.py | 2 +-
 django/tasks/checks.py        | 5 +----
 django/tasks/exceptions.py    | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/django/tasks/__init__.py b/django/tasks/__init__.py
index 31a12f9890..121c706951 100644
--- a/django/tasks/__init__.py
+++ b/django/tasks/__init__.py
@@ -13,6 +13,7 @@ from .task import (
 
 __all__ = [
     "tasks",
+    "default_task_backend",
     "DEFAULT_TASK_BACKEND_ALIAS",
     "DEFAULT_QUEUE_NAME",
     "task",
@@ -26,10 +27,7 @@ class TasksHandler(BaseConnectionHandler):
     exception_class = InvalidTaskBackendError
 
     def create_connection(self, alias):
-        params = self.settings[alias].copy()
-
-        # Added back to allow a backend to self-identify
-        params["ALIAS"] = alias
+        params = self.settings[alias]
 
         backend = params["BACKEND"]
 
@@ -40,7 +38,7 @@ class TasksHandler(BaseConnectionHandler):
                 f"Could not find backend '{backend}': {e}"
             ) from e
 
-        return backend_cls(params)
+        return backend_cls({**params, "ALIAS": alias})
 
 
 tasks = TasksHandler()
diff --git a/django/tasks/backends/base.py b/django/tasks/backends/base.py
index 51f42a0fbb..f72c05417e 100644
--- a/django/tasks/backends/base.py
+++ b/django/tasks/backends/base.py
@@ -39,7 +39,7 @@ class BaseTaskBackend(metaclass=ABCMeta):
         if not connections.settings:
             return False
 
-        if isinstance(task.enqueue_on_commit, bool):
+        if task.enqueue_on_commit is not None:
             return task.enqueue_on_commit
 
         return self.enqueue_on_commit
diff --git a/django/tasks/checks.py b/django/tasks/checks.py
index fd87f8602d..1182103483 100644
--- a/django/tasks/checks.py
+++ b/django/tasks/checks.py
@@ -8,7 +8,4 @@ def check_tasks(app_configs=None, **kwargs):
     from django.tasks import tasks
 
     for backend in tasks.all():
-        try:
-            yield from backend.check()
-        except NotImplementedError:
-            pass
+        yield from backend.check()
diff --git a/django/tasks/exceptions.py b/django/tasks/exceptions.py
index ec1ab3823f..0e59eb7d41 100644
--- a/django/tasks/exceptions.py
+++ b/django/tasks/exceptions.py
@@ -3,7 +3,7 @@ from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 
 class InvalidTaskError(Exception):
     """
-    The provided task function is invalid.
+    The provided task is invalid.
     """