Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14765 -- Removed unncessary usage of NodeList in ForNode.

Thanks traff and FunkyBob for work on the patch.
  • Loading branch information...
commit 12023887ea3e495e070b1f624078612776edf9be 1 parent da800be
@timgraham timgraham authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/template/defaulttags.py
View
6 django/template/defaulttags.py
@@ -16,7 +16,7 @@
render_value_in_context)
from django.template.smartif import IfParser, Literal
from django.template.defaultfilters import date
-from django.utils.encoding import smart_text
+from django.utils.encoding import force_text, smart_text
from django.utils.safestring import mark_safe
from django.utils.html import format_html
from django.utils import six
@@ -154,7 +154,7 @@ def render(self, context):
len_values = len(values)
if len_values < 1:
return self.nodelist_empty.render(context)
- nodelist = NodeList()
+ nodelist = []
if self.is_reversed:
values = reversed(values)
unpack = len(self.loopvars) > 1
@@ -205,7 +205,7 @@ def render(self, context):
# don't want to leave any vars from the previous loop on the
# context.
context.pop()
- return nodelist.render(context)
+ return mark_safe(''.join([force_text(n) for n in nodelist]))
class IfChangedNode(Node):
child_nodelists = ('nodelist_true', 'nodelist_false')

0 comments on commit 1202388

Please sign in to comment.
Something went wrong with that request. Please try again.