Skip to content

Commit db16728

Browse files
committed
Don't format error messages on validators, fixes #3354
1 parent 8cae462 commit db16728

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

rest_framework/fields.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -820,11 +820,9 @@ def __init__(self, **kwargs):
820820
self.min_value = kwargs.pop('min_value', None)
821821
super(IntegerField, self).__init__(**kwargs)
822822
if self.max_value is not None:
823-
message = self.error_messages['max_value'].format(max_value=self.max_value)
824-
self.validators.append(MaxValueValidator(self.max_value, message=message))
823+
self.validators.append(MaxValueValidator(self.max_value))
825824
if self.min_value is not None:
826-
message = self.error_messages['min_value'].format(min_value=self.min_value)
827-
self.validators.append(MinValueValidator(self.min_value, message=message))
825+
self.validators.append(MinValueValidator(self.min_value))
828826

829827
def to_internal_value(self, data):
830828
if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH:
@@ -854,11 +852,9 @@ def __init__(self, **kwargs):
854852
self.min_value = kwargs.pop('min_value', None)
855853
super(FloatField, self).__init__(**kwargs)
856854
if self.max_value is not None:
857-
message = self.error_messages['max_value'].format(max_value=self.max_value)
858-
self.validators.append(MaxValueValidator(self.max_value, message=message))
855+
self.validators.append(MaxValueValidator(self.max_value))
859856
if self.min_value is not None:
860-
message = self.error_messages['min_value'].format(min_value=self.min_value)
861-
self.validators.append(MinValueValidator(self.min_value, message=message))
857+
self.validators.append(MinValueValidator(self.min_value))
862858

863859
def to_internal_value(self, data):
864860
if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH:
@@ -903,11 +899,9 @@ def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=
903899
super(DecimalField, self).__init__(**kwargs)
904900

905901
if self.max_value is not None:
906-
message = self.error_messages['max_value'].format(max_value=self.max_value)
907-
self.validators.append(MaxValueValidator(self.max_value, message=message))
902+
self.validators.append(MaxValueValidator(self.max_value))
908903
if self.min_value is not None:
909-
message = self.error_messages['min_value'].format(min_value=self.min_value)
910-
self.validators.append(MinValueValidator(self.min_value, message=message))
904+
self.validators.append(MinValueValidator(self.min_value))
911905

912906
def to_internal_value(self, data):
913907
"""

0 commit comments

Comments
 (0)