mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-22 17:47:04 +03:00
Minor cleanup
This commit is contained in:
parent
a435b1b355
commit
dec3493d7c
|
@ -578,19 +578,10 @@ class CharField(Field):
|
||||||
|
|
||||||
def to_internal_value(self, data):
|
def to_internal_value(self, data):
|
||||||
value = six.text_type(data)
|
value = six.text_type(data)
|
||||||
|
return value.strip() if self.trim_whitespace else value
|
||||||
if self.trim_whitespace:
|
|
||||||
return value.strip()
|
|
||||||
|
|
||||||
return value
|
|
||||||
|
|
||||||
def to_representation(self, value):
|
def to_representation(self, value):
|
||||||
representation = six.text_type(value)
|
return six.text_type(value)
|
||||||
|
|
||||||
if self.trim_whitespace:
|
|
||||||
return representation.strip()
|
|
||||||
|
|
||||||
return representation
|
|
||||||
|
|
||||||
|
|
||||||
class EmailField(CharField):
|
class EmailField(CharField):
|
||||||
|
@ -603,12 +594,6 @@ class EmailField(CharField):
|
||||||
validator = EmailValidator(message=self.error_messages['invalid'])
|
validator = EmailValidator(message=self.error_messages['invalid'])
|
||||||
self.validators.append(validator)
|
self.validators.append(validator)
|
||||||
|
|
||||||
def to_internal_value(self, data):
|
|
||||||
return six.text_type(data).strip()
|
|
||||||
|
|
||||||
def to_representation(self, value):
|
|
||||||
return six.text_type(value).strip()
|
|
||||||
|
|
||||||
|
|
||||||
class RegexField(CharField):
|
class RegexField(CharField):
|
||||||
default_error_messages = {
|
default_error_messages = {
|
||||||
|
|
|
@ -412,11 +412,11 @@ class TestCharField(FieldValues):
|
||||||
|
|
||||||
def test_trim_whitespace_default(self):
|
def test_trim_whitespace_default(self):
|
||||||
field = serializers.CharField()
|
field = serializers.CharField()
|
||||||
assert field.to_representation(' abc ') == 'abc'
|
assert field.to_internal_value(' abc ') == 'abc'
|
||||||
|
|
||||||
def test_trim_whitespace_disabled(self):
|
def test_trim_whitespace_disabled(self):
|
||||||
field = serializers.CharField(trim_whitespace=False)
|
field = serializers.CharField(trim_whitespace=False)
|
||||||
assert field.to_representation(' abc ') == ' abc '
|
assert field.to_internal_value(' abc ') == ' abc '
|
||||||
|
|
||||||
|
|
||||||
class TestEmailField(FieldValues):
|
class TestEmailField(FieldValues):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user