Removed input value from deault_error_message (#5881)

chickahoona · carltongibson · commit 7d64b7016dce · 2018-04-20T16:00:27.000+02:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -642,7 +642,7 @@ def __repr__(self):
 
 class BooleanField(Field):
     default_error_messages = {
-        'invalid': _('"{input}" is not a valid boolean.')
+        'invalid': _('Must be a valid boolean.')
     }
     default_empty_html = False
     initial = False
@@ -687,7 +687,7 @@ def to_representation(self, value):
 
 class NullBooleanField(Field):
     default_error_messages = {
-        'invalid': _('"{input}" is not a valid boolean.')
+        'invalid': _('Must be a valid boolean.')
     }
     initial = None
     TRUE_VALUES = {
@@ -841,7 +841,7 @@ class UUIDField(Field):
     valid_formats = ('hex_verbose', 'hex', 'int', 'urn')
 
     default_error_messages = {
-        'invalid': _('"{value}" is not a valid UUID.'),
+        'invalid': _('Must be a valid UUID.'),
     }
 
     def __init__(self, **kwargs):
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -629,7 +629,7 @@ class TestBooleanField(FieldValues):
         False: False,
     }
     invalid_inputs = {
-        'foo': ['"foo" is not a valid boolean.'],
+        'foo': ['Must be a valid boolean.'],
         None: ['This field may not be null.']
     }
     outputs = {
@@ -654,7 +654,7 @@ def test_disallow_unhashable_collection_types(self):
         for input_value in inputs:
             with pytest.raises(serializers.ValidationError) as exc_info:
                 field.run_validation(input_value)
-            expected = ['"{0}" is not a valid boolean.'.format(input_value)]
+            expected = ['Must be a valid boolean.'.format(input_value)]
             assert exc_info.value.detail == expected
 
 
@@ -671,7 +671,7 @@ class TestNullBooleanField(TestBooleanField):
         None: None
     }
     invalid_inputs = {
-        'foo': ['"foo" is not a valid boolean.'],
+        'foo': ['Must be a valid boolean.'],
     }
     outputs = {
         'true': True,
@@ -815,8 +815,8 @@ class TestUUIDField(FieldValues):
         284758210125106368185219588917561929842: uuid.UUID('d63a6fb6-88d5-40c7-a91c-9edf73283072')
     }
     invalid_inputs = {
-        '825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.'],
-        (1, 2, 3): ['"(1, 2, 3)" is not a valid UUID.']
+        '825d7aeb-05a9-45b5-a5b7': ['Must be a valid UUID.'],
+        (1, 2, 3): ['Must be a valid UUID.']
     }
     outputs = {
         uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'): '825d7aeb-05a9-45b5-a5b7-05df87923cda'

Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ class TestBooleanField(FieldValues):`
`629`	`629`	`False: False,`
`630`	`630`	`}`
`631`	`631`	`invalid_inputs = {`
`632`		`- 'foo': ['"foo" is not a valid boolean.'],`
	`632`	`+ 'foo': ['Must be a valid boolean.'],`
`633`	`633`	`None: ['This field may not be null.']`
`634`	`634`	`}`
`635`	`635`	`outputs = {`
`@@ -654,7 +654,7 @@ def test_disallow_unhashable_collection_types(self):`
`654`	`654`	`for input_value in inputs:`
`655`	`655`	`with pytest.raises(serializers.ValidationError) as exc_info:`
`656`	`656`	`field.run_validation(input_value)`
`657`		`- expected = ['"{0}" is not a valid boolean.'.format(input_value)]`
	`657`	`+ expected = ['Must be a valid boolean.'.format(input_value)]`
`658`	`658`	`assert exc_info.value.detail == expected`
`659`	`659`
`660`	`660`
`@@ -671,7 +671,7 @@ class TestNullBooleanField(TestBooleanField):`
`671`	`671`	`None: None`
`672`	`672`	`}`
`673`	`673`	`invalid_inputs = {`
`674`		`- 'foo': ['"foo" is not a valid boolean.'],`
	`674`	`+ 'foo': ['Must be a valid boolean.'],`
`675`	`675`	`}`
`676`	`676`	`outputs = {`
`677`	`677`	`'true': True,`
`@@ -815,8 +815,8 @@ class TestUUIDField(FieldValues):`
`815`	`815`	`284758210125106368185219588917561929842: uuid.UUID('d63a6fb6-88d5-40c7-a91c-9edf73283072')`
`816`	`816`	`}`
`817`	`817`	`invalid_inputs = {`
`818`		`- '825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.'],`
`819`		`- (1, 2, 3): ['"(1, 2, 3)" is not a valid UUID.']`
	`818`	`+ '825d7aeb-05a9-45b5-a5b7': ['Must be a valid UUID.'],`
	`819`	`+ (1, 2, 3): ['Must be a valid UUID.']`
`820`	`820`	`}`
`821`	`821`	`outputs = {`
`822`	`822`	`uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'): '825d7aeb-05a9-45b5-a5b7-05df87923cda'`