From 5dba5fda551afe169dce7620b08a99c3455ebb00 Mon Sep 17 00:00:00 2001
From: David Sanders <shang.xiao.sanders@gmail.com>
Date: Wed, 29 Mar 2023 17:54:04 +1100
Subject: [PATCH] Fixed #34427 -- Improved error message when context processor
 does not return a dict.

---
 django/template/context.py           | 10 +++++++++-
 tests/template_tests/test_context.py | 29 +++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/django/template/context.py b/django/template/context.py
index ccf0b430dcb..080a2dd9c08 100644
--- a/django/template/context.py
+++ b/django/template/context.py
@@ -251,7 +251,15 @@ class RequestContext(Context):
         processors = template.engine.template_context_processors + self._processors
         updates = {}
         for processor in processors:
-            updates.update(processor(self.request))
+            context = processor(self.request)
+            try:
+                updates.update(context)
+            except TypeError as e:
+                raise TypeError(
+                    f"Context processor {processor.__qualname__} didn't return a "
+                    "dictionary."
+                ) from e
+
         self.dicts[self._processors_index] = updates
 
         try:
diff --git a/tests/template_tests/test_context.py b/tests/template_tests/test_context.py
index 4feb9e57d63..7420bb4c368 100644
--- a/tests/template_tests/test_context.py
+++ b/tests/template_tests/test_context.py
@@ -10,7 +10,7 @@ from django.template import (
     VariableDoesNotExist,
 )
 from django.template.context import RenderContext
-from django.test import RequestFactory, SimpleTestCase
+from django.test import RequestFactory, SimpleTestCase, override_settings
 
 
 class ContextTests(SimpleTestCase):
@@ -222,6 +222,10 @@ class ContextTests(SimpleTestCase):
         self.assertEqual(c.dicts[-1]["a"], 2)
 
 
+def context_process_returning_none(request):
+    return None
+
+
 class RequestContextTests(SimpleTestCase):
     request_factory = RequestFactory()
 
@@ -276,3 +280,26 @@ class RequestContextTests(SimpleTestCase):
         context = RequestContext(request, {})
         context["foo"] = "foo"
         self.assertEqual(template.render(context), "foo")
+
+    @override_settings(
+        TEMPLATES=[
+            {
+                "BACKEND": "django.template.backends.django.DjangoTemplates",
+                "OPTIONS": {
+                    "context_processors": [
+                        "django.template.context_processors.request",
+                        "template_tests.test_context.context_process_returning_none",
+                    ],
+                },
+            }
+        ],
+    )
+    def test_template_context_processor_returning_none(self):
+        request_context = RequestContext(HttpRequest())
+        msg = (
+            "Context processor context_process_returning_none didn't return a "
+            "dictionary."
+        )
+        with self.assertRaisesMessage(TypeError, msg):
+            with request_context.bind_template(Template("")):
+                pass