mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #17529 -- get_template_from_string default arguments break

Browse Source 
``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>'``.
This commit is contained in:
Unai Zalakain
2013-11-04 16:50:14 +01:00
committed by Claude Paroz
parent bc21e9c0d9
commit 72f63bd24d
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
django/template/base.py
View File

@@ -121,8 +121,7 @@ class StringOrigin(Origin):
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:

3
django/test/testcases.py
View File

@@ -506,7 +506,8 @@ class SimpleTestCase(unittest.TestCase):
# 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=''):