diff options
| author | Carlton Gibson | 2014-04-09 15:52:26 +0200 |
|---|---|---|
| committer | Carlton Gibson | 2014-04-09 15:52:26 +0200 |
| commit | 645ef9895f8112c3042e26fc6aa49735237f3769 (patch) | |
| tree | aae8d237b1a68e6e2ffb1b9a865bc09e87e26be3 /rest_framework | |
| parent | c1ac65edce1bcfff4c87df3bb9c4df14fe8e9d6c (diff) | |
| parent | b0ba8d61ecf3c74470fa6ac019caff1fd4ca1be6 (diff) | |
| download | django-rest-framework-645ef9895f8112c3042e26fc6aa49735237f3769.tar.bz2 | |
Merge branch 'refs/heads/master' into #1408
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 68b95682..946a5954 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -164,7 +164,7 @@ class Field(object): Called to set up a field prior to field_to_native or field_from_native. parent - The parent serializer. - model_field - The model field this field corresponds to, if one exists. + field_name - The name of the field being initialized. """ self.parent = parent self.root = parent.root or parent |