summaryrefslogtreecommitdiff
path: root/tests/middleware_exceptions
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-01-09 22:59:00 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-01-12 21:01:34 +0100
commit79deb6a0716e554cac5308e86f5754f19ad436dc (patch)
tree28fb9b1b9983217d91f598c1677a0f048fb3d349 /tests/middleware_exceptions
parenta3e783fe11dd25bbf84bfb6201186566ed473506 (diff)
downloaddjango-79deb6a0716e554cac5308e86f5754f19ad436dc.tar.gz
Accounted for multiple template engines in template responses.
Diffstat (limited to 'tests/middleware_exceptions')
-rw-r--r--tests/middleware_exceptions/tests.py5
-rw-r--r--tests/middleware_exceptions/views.py8
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py
index 8a2ddfa4a1..8c191e4ea5 100644
--- a/tests/middleware_exceptions/tests.py
+++ b/tests/middleware_exceptions/tests.py
@@ -5,7 +5,7 @@ from django.core.exceptions import MiddlewareNotUsed
from django.core.signals import got_request_exception
from django.http import HttpResponse
from django.template.response import TemplateResponse
-from django.template import Template
+from django.template import engines
from django.test import RequestFactory, TestCase, override_settings
from django.test.utils import patch_logger
@@ -63,7 +63,8 @@ class ResponseMiddleware(TestMiddleware):
class TemplateResponseMiddleware(TestMiddleware):
def process_template_response(self, request, response):
super(TemplateResponseMiddleware, self).process_template_response(request, response)
- return TemplateResponse(request, Template('Template Response Middleware'))
+ template = engines['django'].from_string('Template Response Middleware')
+ return TemplateResponse(request, template)
class ExceptionMiddleware(TestMiddleware):
diff --git a/tests/middleware_exceptions/views.py b/tests/middleware_exceptions/views.py
index 59abe26bff..d3d7fae661 100644
--- a/tests/middleware_exceptions/views.py
+++ b/tests/middleware_exceptions/views.py
@@ -1,6 +1,6 @@
from django import http
from django.core.exceptions import PermissionDenied
-from django.template import Template
+from django.template import engines
from django.template.response import TemplateResponse
@@ -9,11 +9,13 @@ def normal_view(request):
def template_response(request):
- return TemplateResponse(request, Template('OK'))
+ template = engines['django'].from_string('OK')
+ return TemplateResponse(request, template)
def template_response_error(request):
- return TemplateResponse(request, Template('{%'))
+ template = engines['django'].from_string('{%')
+ return TemplateResponse(request, template)
def not_found(request):