p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #26173 -- Prevented localize_input() from formatting booleans as numbers.

This commit is contained in:
Marcin Markiewicz 2016-02-03 15:59:55 +01:00 committed by Tim Graham
parent bb51dc902d
commit f7a9872b91
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/formats.py
View File

@ -214,6 +214,8 @@ def localize_input(value, default=None):
""" """
if isinstance(value, six.string_types): # Handle strings first for performance reasons. if isinstance(value, six.string_types): # Handle strings first for performance reasons.
return value return value
elif isinstance(value, bool): # Don't treat booleans as numbers.
return six.text_type(value)
elif isinstance(value, (decimal.Decimal, float) + six.integer_types): elif isinstance(value, (decimal.Decimal, float) + six.integer_types):
return number_format(value) return number_format(value)
elif isinstance(value, datetime.datetime): elif isinstance(value, datetime.datetime):

4
tests/i18n/tests.py
View File

@ -1117,6 +1117,10 @@ class FormattingTests(SimpleTestCase):
form6.as_ul() form6.as_ul()
) )
def test_localized_input_func(self):
with self.settings(USE_THOUSAND_SEPARATOR=True):
self.assertEqual(localize_input(True), 'True')
def test_sanitize_separators(self): def test_sanitize_separators(self):
""" """
Tests django.utils.formats.sanitize_separators. Tests django.utils.formats.sanitize_separators.