Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Backed out a portion of [4919] until I can make it worth smoothly with

oldforms. Refs #3924.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 73c40c5999d6945ada3e1da3c7ec693d977bffea 1 parent e57d1bd
Malcolm Tredinnick malcolmt authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/utils/html.py
2  django/utils/html.py
View
@@ -25,7 +25,7 @@
def escape(html):
"Returns the given HTML with ampersands, quotes and carets encoded"
if not isinstance(html, basestring):
- html = smart_unicode(html)
+ html = str(html)
return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;')
def linebreaks(value):
Please sign in to comment.
Something went wrong with that request. Please try again.