Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2

1 files changed, 0 insertions, 7 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 5d13bd55..bb9a523d 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -409,13 +409,6 @@ class BooleanField(WritableField):
             return False
         raise ValidationError(self.error_messages['invalid'] % value)
 
-class TextField(WritableField):
-    type_name = 'TextField'
-
-    def from_native(self, value):
-        if isinstance(value, basestring) or value is None:
-            return value
-        return smart_unicode(value)
 
 class CharField(WritableField):
     type_name = 'CharField'