Ticket #10912: firstof_autoescape_t10912_r10630.diff

django/template/defaulttags.py

@@ -10 +10 @@
 
 from django.template import Node, NodeList, Template, Context, Variable
 from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END
-from django.template import get_library, Library, InvalidTemplateLibrary
+from django.template import get_library, Library, InvalidTemplateLibrary, _render_value_in_context
 from django.conf import settings
-from django.utils.encoding import smart_str, smart_unicode
+from django.utils.encoding import smart_str
 from django.utils.itercompat import groupby
 from django.utils.safestring import mark_safe
 
@@ -76 +76 @@
         for var in self.vars:
             value = var.resolve(context, True)
             if value:
-                return smart_unicode(value)
+                return _render_value_in_context(value, context)
         return u''
 
 class ForNode(Node):

tests/regressiontests/templates/tests.py

@@ -501 +501 @@
             'firstof07': ('{% firstof a b "c" %}', {'a':0}, 'c'),
             'firstof08': ('{% firstof a b "c and d" %}', {'a':0,'b':0}, 'c and d'),
             'firstof09': ('{% firstof %}', {}, template.TemplateSyntaxError),
+            'firstof10': ('{% firstof a %}', {'a': '<'}, '&lt;'),
 
             ### FOR TAG ###############################################################
             'for-tag01': ("{% for val in values %}{{ val }}{% endfor %}", {"values": [1, 2, 3]}, "123"),