From 6cf6ff9537dd9aab5eb99755bb221f8a41a1c3eb Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 20 Apr 2018 15:41:31 +0200 Subject: [PATCH] =?UTF-8?q?Use=20=E2=80=9CMust=20be=E2=80=A6=E2=80=9D=20wo?= =?UTF-8?q?rding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit as per review from @tomchristie. --- rest_framework/fields.py | 6 +++--- tests/test_fields.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a08dc77a8..28eca13e6 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -642,7 +642,7 @@ class Field(object): class BooleanField(Field): default_error_messages = { - 'invalid': _('Is not a valid boolean.') + 'invalid': _('Must be a valid boolean.') } default_empty_html = False initial = False @@ -687,7 +687,7 @@ class BooleanField(Field): class NullBooleanField(Field): default_error_messages = { - 'invalid': _('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': _('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 index a511a34fe..d49dab889 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -573,7 +573,7 @@ class TestBooleanField(FieldValues): False: False, } invalid_inputs = { - 'foo': ['Is not a valid boolean.'], + 'foo': ['Must be a valid boolean.'], None: ['This field may not be null.'] } outputs = { @@ -598,7 +598,7 @@ class TestBooleanField(FieldValues): for input_value in inputs: with pytest.raises(serializers.ValidationError) as exc_info: field.run_validation(input_value) - expected = ['Is not a valid boolean.'.format(input_value)] + expected = ['Must be a valid boolean.'.format(input_value)] assert exc_info.value.detail == expected @@ -615,7 +615,7 @@ class TestNullBooleanField(TestBooleanField): None: None } invalid_inputs = { - 'foo': ['Is not a valid boolean.'], + 'foo': ['Must be a valid boolean.'], } outputs = { 'true': True, @@ -759,8 +759,8 @@ class TestUUIDField(FieldValues): 284758210125106368185219588917561929842: uuid.UUID('d63a6fb6-88d5-40c7-a91c-9edf73283072') } invalid_inputs = { - '825d7aeb-05a9-45b5-a5b7': ['Is not a valid UUID.'], - (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'