summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-24 00:48:36 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-24 00:48:36 +0000
commit9c44751c082a55d108bc05f075b34d523532404d (patch)
treebfb1f060c4dc2d20419e5f755bfccdd448356d88
parentb25f6e9526ba3ccbdbe3c4f0d78813e9412a7acf (diff)
unicode: Removed some redundant code.
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/utils/html.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/django/utils/html.py b/django/utils/html.py
index 311a4d5c35..79b0d6d5af 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -25,8 +25,6 @@ del x # Temporary variable
def escape(html):
"Returns the given HTML with ampersands, quotes and carets encoded"
- if not isinstance(html, basestring):
- html = force_unicode(html)
return force_unicode(html).replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;')
escape = allow_lazy(escape, unicode)