aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorTom Christie2012-10-15 04:50:28 -0700
committerTom Christie2012-10-15 04:50:28 -0700
commite88ca9637bd4f49659dd80ca7afd0f38adf07746 (patch)
tree2cf1ca191bd1136664e12ac898eb8ebe67410b32 /rest_framework/fields.py
parent41dd63b3b0abcb615768fe2774cbdf10b9ba1cf0 (diff)
parentc94272650915eef368cdc5d157644884c3eecccb (diff)
downloaddjango-rest-framework-e88ca9637bd4f49659dd80ca7afd0f38adf07746.tar.bz2
Merge pull request #295 from ulmus/restframework2
Added TextField to serializer
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index bb9a523d..5d13bd55 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -409,6 +409,13 @@ 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'