aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorMarko Tibold2012-11-15 22:48:22 +0100
committerMarko Tibold2012-11-15 22:48:22 +0100
commit403886b79b9bf5790ee6f07d6ca915cff5b3035a (patch)
tree987db12d60d8dbf56d8f23ff694d7208df6e3184 /rest_framework/fields.py
parent69a01d71256b9923aac1b8d1b91063068ecfebf7 (diff)
parent3b258d69c92e9d9293f7c5d1690f0ca434e677e3 (diff)
downloaddjango-rest-framework-403886b79b9bf5790ee6f07d6ca915cff5b3035a.tar.bz2
Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into file_and_image_fields
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index fd57aa2c..70455667 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -323,7 +323,7 @@ class RelatedField(WritableField):
choices = property(_get_choices, _set_choices)
- ### Regular serializier stuff...
+ ### Regular serializer stuff...
def field_to_native(self, obj, field_name):
value = getattr(obj, self.source or field_name)