Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #9756: the for tag no longer leaves the context stack unbalance…

…d when dealing with an empty iterable. Thanks, seanl.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6d6bbb6d0571d32b10978dc36a905c8d48c3ce1c 1 parent 4f7950a
@jacobian jacobian authored
View
1  django/template/defaulttags.py
@@ -125,6 +125,7 @@ def render(self, context):
values = list(values)
len_values = len(values)
if len_values < 1:
+ context.pop()
return self.nodelist_empty.render(context)
nodelist = NodeList()
if self.is_reversed:
View
13 tests/regressiontests/templates/tests.py
@@ -69,6 +69,9 @@ class SomeException(Exception):
class SomeOtherException(Exception):
pass
+
+class ContextStackException(Exception):
+ pass
class SomeClass:
def __init__(self):
@@ -231,6 +234,9 @@ def test_template_loader(template_name, template_dirs=None):
try:
test_template = loader.get_template(name)
output = self.render(test_template, vals)
+ except ContextStackException:
+ failures.append("Template test (TEMPLATE_STRING_IF_INVALID='%s'): %s -- FAILED. Context stack was left imbalanced" % (invalid_str, name))
+ continue
except Exception:
exc_type, exc_value, exc_tb = sys.exc_info()
if exc_type != result:
@@ -256,7 +262,12 @@ def test_template_loader(template_name, template_dirs=None):
('-'*70, ("\n%s\n" % ('-'*70)).join(failures)))
def render(self, test_template, vals):
- return test_template.render(template.Context(vals[1]))
+ context = template.Context(vals[1])
+ before_stack_size = len(context.dicts)
+ output = test_template.render(context)
+ if len(context.dicts) != before_stack_size:
+ raise ContextStackException
+ return output
def get_template_tests(self):
# SYNTAX --
Please sign in to comment.
Something went wrong with that request. Please try again.