innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Made django.utils.html.escape() work with unicode strings (and unicode-like 

objects). Refs #3897.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-04-04 06:43:28 +00:00
parent 1bddac37b6
commit 5212911b19
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/utils/html.py
View File

@ -1,6 +1,7 @@
"HTML utilities suitable for global use." "HTML utilities suitable for global use."
import re, string import re, string
from django.utils.encoding import smart_unicode
# Configuration for urlize() function # Configuration for urlize() function
LEADING_PUNCTUATION = ['(', '<', '&lt;'] LEADING_PUNCTUATION = ['(', '<', '&lt;']
@ -24,7 +25,7 @@ del x # Temporary variable
def escape(html): def escape(html):
"Returns the given HTML with ampersands, quotes and carets encoded" "Returns the given HTML with ampersands, quotes and carets encoded"
if not isinstance(html, basestring): if not isinstance(html, basestring):
html = str(html) html = smart_unicode(html)
return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;') return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;')
def linebreaks(value): def linebreaks(value):

19
tests/regressiontests/defaultfilters/tests.py
View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
r""" r"""
>>> floatformat(7.7) >>> floatformat(7.7)
'7.7' '7.7'
@ -87,19 +89,19 @@ u'\xeb'
>>> truncatewords('A sentence with a few words in it', 'not a number') >>> truncatewords('A sentence with a few words in it', 'not a number')
'A sentence with a few words in it' 'A sentence with a few words in it'
>>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 0) >>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 0)
'' ''
>>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 2) >>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 2)
'<p>one <a href="#">two ...</a></p>' '<p>one <a href="#">two ...</a></p>'
>>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 4) >>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 4)
'<p>one <a href="#">two - three <br>four ...</a></p>' '<p>one <a href="#">two - three <br>four ...</a></p>'
>>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 5) >>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 5)
'<p>one <a href="#">two - three <br>four</a> five</p>' '<p>one <a href="#">two - three <br>four</a> five</p>'
>>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 100) >>> truncatewords_html('<p>one <a href="#">two - three <br>four</a> five</p>', 100)
'<p>one <a href="#">two - three <br>four</a> five</p>' '<p>one <a href="#">two - three <br>four</a> five</p>'
>>> upper('Mixed case input') >>> upper('Mixed case input')
@ -166,6 +168,9 @@ u'\xcb'
>>> escape('<some html & special characters > here') >>> escape('<some html & special characters > here')
'&lt;some html &amp; special characters &gt; here' '&lt;some html &amp; special characters &gt; here'
>>> 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'
>>> linebreaks('line 1') >>> linebreaks('line 1')
'<p>line 1</p>' '<p>line 1</p>'