innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.10.x] Fixed #26890 -- Fixed IntegerField crash on Unicode numbers. 

Backport of 76e19da5b0 from master
This commit is contained in:
Jon Dufresne 2016-07-14 06:38:57 -07:00 committed by Tim Graham
parent 5c56ce7a3f
commit acb804e552
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/fields.py
View File

@ -275,7 +275,7 @@ class IntegerField(Field):
value = formats.sanitize_separators(value) value = formats.sanitize_separators(value)
# Strip trailing decimal and zeros. # Strip trailing decimal and zeros.
try: try:
value = int(self.re_decimal.sub('', str(value))) value = int(self.re_decimal.sub('', force_text(value)))
except (ValueError, TypeError): except (ValueError, TypeError):
raise ValidationError(self.error_messages['invalid'], code='invalid') raise ValidationError(self.error_messages['invalid'], code='invalid')
return value return value

4
tests/forms_tests/field_tests/test_integerfield.py
View File

@ -123,6 +123,10 @@ class IntegerFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
self.assertEqual(9223372036854775808, f.clean('9223372036854775808')) self.assertEqual(9223372036854775808, f.clean('9223372036854775808'))
self.assertEqual(9223372036854775808, f.clean('9223372036854775808.0')) self.assertEqual(9223372036854775808, f.clean('9223372036854775808.0'))
def test_integerfield_unicode_number(self):
f = IntegerField()
self.assertEqual(50, f.clean('５０'))
def test_integerfield_subclass(self): def test_integerfield_subclass(self):
""" """
Class-defined widget is not overwritten by __init__() (#22245). Class-defined widget is not overwritten by __init__() (#22245).