Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17529 -- get_template_from_string default arguments break

``get_template_from_string`` default arguments were breaking
``assertTemplateUsed``. The solution has been to return only the names of the
templates with a ``name`` attribute distinct of ``None``. The default ``name``
kwarg of ``Template`` has been changed to ``None``, more pythonic than ``'<Unknown
Template>'``.
  • Loading branch information...
commit 72f63bd24d44b5a4f24ad8fa27ebba96d9a507d8 1 parent bc21e9c
@unaizalakain unaizalakain authored claudep committed
View
3  django/template/base.py
@@ -121,8 +121,7 @@ def reload(self):
class Template(object):
- def __init__(self, template_string, origin=None,
- name='<Unknown Template>'):
+ def __init__(self, template_string, origin=None, name=None):
try:
template_string = force_text(template_string)
except UnicodeDecodeError:
View
3  django/test/testcases.py
@@ -506,7 +506,8 @@ def _assert_template_used(self, response, template_name, msg_prefix):
# use this template with context manager
return template_name, None, msg_prefix
- template_names = [t.name for t in response.templates]
+ template_names = [t.name for t in response.templates if t.name is not
+ None]
return None, template_names, msg_prefix
def assertTemplateUsed(self, response=None, template_name=None, msg_prefix=''):
View
7 tests/test_utils/tests.py
@@ -214,6 +214,8 @@ def test_with_client(self):
class AssertTemplateUsedContextManagerTests(TestCase):
+ urls = 'test_utils.urls'
+
def test_usage(self):
with self.assertTemplateUsed('template_used/base.html'):
render_to_string('template_used/base.html')
@@ -270,6 +272,11 @@ def test_error_message(self):
with self.assertTemplateUsed('template_used/base.html'):
render_to_string('template_used/alternative.html')
+ with self.assertRaises(AssertionError) as cm:
+ response = self.client.get('/test_utils/no_template_used/')
+ self.assertTemplateUsed(response, 'template_used/base.html')
+ self.assertEqual(cm.exception.args[0], "No templates used to render the response")
+
def test_failure(self):
with self.assertRaises(TypeError):
with self.assertTemplateUsed():
View
1  tests/test_utils/urls.py
@@ -5,4 +5,5 @@
urlpatterns = patterns('',
(r'^test_utils/get_person/(\d+)/$', views.get_person),
+ (r'^test_utils/no_template_used/$', views.no_template_used),
)
View
5 tests/test_utils/views.py
@@ -1,5 +1,6 @@
from django.http import HttpResponse
from django.shortcuts import get_object_or_404
+from django.template import loader, Context
from .models import Person
@@ -7,3 +8,7 @@
def get_person(request, pk):
person = get_object_or_404(Person, pk=pk)
return HttpResponse(person.name)
+
+def no_template_used(request):
+ template = loader.get_template_from_string("This is a string-based template")
+ return HttpResponse(template.render(Context({})))
Please sign in to comment.
Something went wrong with that request. Please try again.