Ticket #4555: django-unescape.patch

tests/regressiontests/defaultfilters/tests.py

@@ -171 +171 @@
 >>> escape(u'<some html & special characters > here ĐÅ€£')
 u'&lt;some html &amp; special characters &gt; here \xc4\x90\xc3\x85\xe2\x82\xac\xc2\xa3'
 
+>>> unescape('&lt;some html &amp; special characters &gt; here')
+'<some html & special characters > here'
+
+>>> unescape(u'&lt;some html &amp; special characters &gt; here \xc4\x90\xc3\x85\xe2\x82\xac\xc2\xa3')
+u'<some html & special characters > here ĐÅ€£'
+
 >>> linebreaks('line 1')
 '<p>line 1</p>'
 

django/utils/html.py

@@ -28 +28 @@
         html = str(html)
     return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;')
 
+def unescape(html):
+    "Returns the given HTML with ampersands, quotes and carets decoded"
+    if not isinstance(html, basestring):
+        html = str(html)
+    return html.replace('&amp;', '&').replace('&lt;', '<').replace('&gt;', '>').replace('&quot;', '"').replace('&#39;',"'")
+
 def linebreaks(value):
     "Converts newlines into <p> and <br />s"
     value = re.sub(r'\r\n|\r|\n', '\n', value) # normalize newlines

django/template/defaultfilters.py

@@ -259 +268 @@
     return escape(value)
 escape = stringfilter(escape)
 
+def unescape(value):
+    "Unescapes a string's HTML"
+    from django.utils.html import unescape
+    return unescape(value)
+unescape = stringfilter(unescape)
+
 def linebreaks(value):
     "Converts newlines into <p> and <br />s"
     from django.utils.html import linebreaks