From 73c40c5999d6945ada3e1da3c7ec693d977bffea Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Thu, 5 Apr 2007 14:52:33 +0000 Subject: [PATCH] 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 --- django/utils/html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/utils/html.py b/django/utils/html.py index d06440b52e..607362817b 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -25,7 +25,7 @@ del x # Temporary variable 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('&', '&').replace('<', '<').replace('>', '>').replace('"', '"').replace("'", ''') def linebreaks(value):