diff options
| author | Georg Bauer <gb@hugo.westfalen.de> | 2006-01-13 20:57:30 +0000 |
|---|---|---|
| committer | Georg Bauer <gb@hugo.westfalen.de> | 2006-01-13 20:57:30 +0000 |
| commit | e4e2877b248c2b165950709571ccb29a0a0d4910 (patch) | |
| tree | ea6821cccf6707ccb60893e853c618b9e153f88f /django/utils/text.py | |
| parent | 19abf041bf5c25cccca396f16919e42b51253098 (diff) | |
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
Diffstat (limited to 'django/utils/text.py')
| -rw-r--r-- | django/utils/text.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/text.py b/django/utils/text.py index 8206095f42..ce1225b83c 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('\\', '\\\\') |