aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-06-17 13:37:03 +0100
committerTom Christie2014-06-17 13:37:03 +0100
commit511e874185d0d024f0e964f2abafcb366168e542 (patch)
treea6098c77c3e2644b581610956d02f71c80ef2020
parente11f41ebc4ef088a5849771dfda5a7fba4f82904 (diff)
parent544183f64ff115398ae62c916d58f8369263d47c (diff)
downloaddjango-rest-framework-511e874185d0d024f0e964f2abafcb366168e542.tar.bz2
Merge pull request #1645 from tankorsmash/patch-1
tiny typo in the docstring
-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 86e8fd9d..d5c8134b 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -187,7 +187,7 @@ class Field(object):
def field_to_native(self, obj, field_name):
"""
- Given and object and a field name, returns the value that should be
+ Given an object and a field name, returns the value that should be
serialized for that field.
"""
if obj is None: