From e4e2877b248c2b165950709571ccb29a0a0d4910 Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Fri, 13 Jan 2006 20:57:30 +0000 Subject: [PATCH] fixed #1221 - changed usage of wrong settings variable DEFAULT_ENCODING to the correct DEFAULT_CHARSET. git-svn-id: http://code.djangoproject.com/svn/django/trunk@1953 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/text.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/utils/text.py b/django/utils/text.py index 8206095f42e..ce1225b83c9 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -100,7 +100,7 @@ def javascript_quote(s): return r"\u%04x" % ord(match.group(1)) if type(s) == str: - s = s.decode(DEFAULT_ENCODING) + s = s.decode(DEFAULT_CHARSET) elif type(s) != unicode: raise TypeError, s s = s.replace('\\', '\\\\')