From 742ea51413b3aab07c6afbfd1d52c1908ffcb510 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 23 Jun 2016 16:30:07 +0200 Subject: [PATCH] Refs #24829 -- Made TemplateResponse.content available sooner in exception context Thanks Tim Graham for the initial patch. --- django/core/handlers/exception.py | 4 ++++ tests/handlers/tests_custom_error_handlers.py | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/django/core/handlers/exception.py b/django/core/handlers/exception.py index 9edf457ad1..1eaf55e002 100644 --- a/django/core/handlers/exception.py +++ b/django/core/handlers/exception.py @@ -85,6 +85,10 @@ def response_for_exception(request, exc): signals.got_request_exception.send(sender=None, request=request) response = handle_uncaught_exception(request, get_resolver(get_urlconf()), sys.exc_info()) + # Force a TemplateResponse to be rendered. + if not getattr(response, 'is_rendered', True) and callable(getattr(response, 'render', None)): + response = response.render() + return response diff --git a/tests/handlers/tests_custom_error_handlers.py b/tests/handlers/tests_custom_error_handlers.py index 24c2c8b446..04f58fbe2a 100644 --- a/tests/handlers/tests_custom_error_handlers.py +++ b/tests/handlers/tests_custom_error_handlers.py @@ -1,7 +1,19 @@ from django.conf.urls import url from django.core.exceptions import PermissionDenied from django.template.response import TemplateResponse -from django.test import SimpleTestCase, override_settings +from django.test import SimpleTestCase, modify_settings, override_settings + + +class MiddlewareAccessingContent(object): + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + response = self.get_response(request) + # Response.content should be available in the middleware even with a + # TemplateResponse-based exception response. + assert response.content + return response def template_response_error_handler(request, exception=None): @@ -20,6 +32,7 @@ handler403 = template_response_error_handler @override_settings(ROOT_URLCONF='handlers.tests_custom_error_handlers') +@modify_settings(MIDDLEWARE={'append': 'handlers.tests_custom_error_handlers.MiddlewareAccessingContent'}) class CustomErrorHandlerTests(SimpleTestCase): def test_handler_renders_template_response(self):