Ticket #7261: html.diff

django/utils/html.py

@@ -38 +38 @@
     """
     Similar to escape(), except that it doesn't operate on pre-escaped strings.
     """
-    if isinstance(html, SafeData):
-        return html
+    if hasattr(html, '__html__'):
+        return html.__html__()
     else:
         return escape(html)
 

django/utils/safestring.py

@@ -22 +22 @@
     pass
 
 class SafeData(object):
-    pass
+
+    def __html__(self):
+        """
+        Returns the html representation of a string.
+
+        Allows interoperability with other template engines.
+        """
+        return self
 
 class SafeString(str, SafeData):
     """

tests/regressiontests/utils/tests.py

@@ -4 +4 @@
 
 from unittest import TestCase
 
-from django.utils import html, checksums, text
+from django.utils import html, checksums, text, safestring
 from django.utils.functional import SimpleLazyObject
 
 import timesince
@@ -144 +144 @@
         for value, output in items:
             self.check_output(f, value, output)
 
+    def test_conditional_escape(self):
+        s = '<h1>interop</h1>'
+        self.assertEqual(html.conditional_escape(s),
+                         '&lt;h1&gt;interop&lt;/h1&gt;')
+        self.assertEqual(html.conditional_escape(safestring.mark_safe(s)), s)
+
 class TestUtilsChecksums(TestCase):
 
     def check_output(self, function, value, output=None):
@@ -262 +268 @@
         self.assertEqual(u'<p><strong><em>The quick brown fox</em></strong></p>',
             text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4, None))
 
+class TestSafeData(TestCase):
+
+    def test_html(self):
+        s = '<h1>interop</h1>'
+        self.assertEqual(s, safestring.mark_safe(s).__html__())
+
 if __name__ == "__main__":
     import doctest
     doctest.testmod()