aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/fields.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 5955fa3f..e744b173 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -479,7 +479,8 @@ class CharField(WritableField):
if not self.allow_none:
return ''
else:
- # return None implicity because smart_text(None) == 'None'
+ # return None explicitly because smart_text(None) == 'None'
+ # see #1834 for details
return None
return smart_text(value)