summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-01 21:38:58 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-01 21:38:58 +0000
commitac371ccac8dada9f97fd66fc9780c085e7f04470 (patch)
treeec8e7f83b0eb04a9b289a9821e13434f29143dce /django/utils
parent855e805b4cd1ce40751ef166d36cc6f0ae2a2519 (diff)
Fixed #12435 - Handle Unicode characters in format strings correctly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/formats.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/utils/formats.py b/django/utils/formats.py
index db2930316a..77479ae2a6 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -40,6 +40,7 @@ def get_format(format_type):
language (locale), defaults to the format in the settings.
format_type is the name of the format, e.g. 'DATE_FORMAT'
"""
+ format_type = smart_str(format_type)
if settings.USE_L10N:
for module in get_format_modules():
try: