diff options
| author | Tom Christie | 2015-02-06 14:43:43 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-02-06 14:43:43 +0000 | 
| commit | dec3493d7c3ea630a4d51b21bb7e793f0e97ae99 (patch) | |
| tree | 221be2581fa48731058ea4f603296ab7565b3150 /rest_framework | |
| parent | a435b1b3553975a280ec33d709a6aeee1ee415e8 (diff) | |
| download | django-rest-framework-dec3493d7c3ea630a4d51b21bb7e793f0e97ae99.tar.bz2 | |
Minor cleanup
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/fields.py | 19 | 
1 files changed, 2 insertions, 17 deletions
| diff --git a/rest_framework/fields.py b/rest_framework/fields.py index ecf0dc47..382fd2dd 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -578,19 +578,10 @@ class CharField(Field):      def to_internal_value(self, data):          value = six.text_type(data) - -        if self.trim_whitespace: -            return value.strip() - -        return value +        return value.strip() if self.trim_whitespace else value      def to_representation(self, value): -        representation = six.text_type(value) - -        if self.trim_whitespace: -            return representation.strip() - -        return representation +        return six.text_type(value)  class EmailField(CharField): @@ -603,12 +594,6 @@ class EmailField(CharField):          validator = EmailValidator(message=self.error_messages['invalid'])          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):      default_error_messages = { | 
