summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/forms/fields.py2
-rw-r--r--tests/forms_tests/tests/test_fields.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 629aa69c5d..8b5fd2c55e 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -191,6 +191,8 @@ class Field(object):
initial_value = initial if initial is not None else ''
try:
data = self.to_python(data)
+ if hasattr(self, '_coerce'):
+ data = self._coerce(data)
except ValidationError:
return True
data_value = data if data is not None else ''
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index 78b74aee4e..8cea26c37c 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -961,6 +961,7 @@ class FieldsTests(SimpleTestCase):
# has_changed should not trigger required validation
f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=True)
self.assertFalse(f._has_changed(None, ''))
+ self.assertFalse(f._has_changed(1, '1'))
def test_typedchoicefield_special_coerce(self):
"""