Ticket #7261: 7261-add-__html__.diff

django/utils/html.py

@@ -63 +63 @@
     """
     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/html.py

@@ -1 +1 @@
 import unittest
 
-from django.utils import html
+from django.utils import html, safestring
 
 class TestUtilsHtml(unittest.TestCase):
 
@@ -121 +121 @@
         )
         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 TestSafeData(unittest.TestCase):
+
+    def test_html(self):
+        s = '<h1>interop</h1>'
+        self.assertEqual(s, safestring.mark_safe(s).__html__())