mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed #7557 -- Added type checking to Variable initialization. 

Thanks tobias for the suggestion and boblefrag and saz for work on the
patch.
This commit is contained in:
Tim Graham 2013-09-19 09:27:19 -04:00
parent 55b9bff07f
commit 7fec5a2240
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/template/base.py
View File

@ -675,6 +675,9 @@ class Variable(object):
self.translate = False self.translate = False
self.message_context = None self.message_context = None
if not isinstance(var, six.string_types):
raise TypeError(
"Variable must be a string or number, got %s" % type(var))
try: try:
# First try to treat this variable as a number. # First try to treat this variable as a number.
# #

4
tests/template_tests/test_parser.py
View File

@ -87,6 +87,10 @@ class ParserTests(TestCase):
Variable, "article._hidden" Variable, "article._hidden"
) )
# Variables should raise on non string type
with six.assertRaisesRegex(self, TypeError, "Variable must be a string or number, got <(class|type) 'dict'>"):
Variable({})
@override_settings(DEBUG=True, TEMPLATE_DEBUG=True) @override_settings(DEBUG=True, TEMPLATE_DEBUG=True)
def test_compile_filter_error(self): def test_compile_filter_error(self):
# regression test for #19819 # regression test for #19819