Ticket #6474: utils_conditional_escape.diff

django/utils/html.py

@@ -38 +38 @@
     """
     if isinstance(html, SafeData):
         return html
+    html = force_unicode(html)
+    if isinstance(html, SafeData):
+        return html
     else:
         return escape(html)
 

tests/regressiontests/utils/tests.py

@@ -5 +5 @@
 from unittest import TestCase
 
 from django.utils import html, checksums
+from django.utils.safestring import mark_safe
 
 import timesince
 import datastructures
@@ -45 +46 @@
         # Verify it doesn't double replace &.
         self.check_output(f, '<&', '&lt;&amp;')
 
+    def test_conditional_escape(self):
+        class BoldHTML(object):
+            def __init__(self, content):
+                self.content = content
+            def __unicode__(self):
+                return mark_safe(u'<b>%s</b>' % f(self.content))
+        f = html.conditional_escape
+        b = BoldHTML('a')
+        self.check_output(f, b, '<b>a</b>')
+        b = BoldHTML('<>')
+        self.check_output(f, b, '<b>&lt;&gt;</b>')
+
     def test_linebreaks(self):
         f = html.linebreaks
         items = (