From dec3493d7c3ea630a4d51b21bb7e793f0e97ae99 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 6 Feb 2015 14:43:43 +0000
Subject: Minor cleanup

---
 rest_framework/fields.py | 19 ++-----------------
 tests/test_fields.py     |  4 ++--
 2 files changed, 4 insertions(+), 19 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 = {
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 5a5418e6..ab3418bd 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -412,11 +412,11 @@ class TestCharField(FieldValues):
 
     def test_trim_whitespace_default(self):
         field = serializers.CharField()
-        assert field.to_representation(' abc ') == 'abc'
+        assert field.to_internal_value(' abc ') == 'abc'
 
     def test_trim_whitespace_disabled(self):
         field = serializers.CharField(trim_whitespace=False)
-        assert field.to_representation(' abc ') == ' abc '
+        assert field.to_internal_value(' abc ') == ' abc '
 
 
 class TestEmailField(FieldValues):
-- 
cgit v1.2.3