diff options
| author | Tom Christie | 2012-10-17 22:19:59 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-17 22:19:59 +0100 |
| commit | 4231995fbd80e45991975ab81d9e570a9f4b72d0 (patch) | |
| tree | 6aedfb8cdad5ec1500a4dddcd9bb49026a836255 /docs | |
| parent | 99d48f90030d174ef80498b48f56af6489865f0d (diff) | |
| download | django-rest-framework-4231995fbd80e45991975ab81d9e570a9f4b72d0.tar.bz2 | |
parser_context includes `view`, `request`, `args`, `kwargs`. (Not `meta` and `upload_handlers`)
Consistency with renderer API.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api-guide/parsers.md | 4 | ||||
| -rw-r--r-- | docs/api-guide/renderers.md | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index a950c0e0..70abad9b 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -103,7 +103,9 @@ A stream-like object representing the body of the request. ### parser_context -If supplied, this argument will be a dictionary containing any additional context that may be required to parse the request content. By default it includes the keys `'upload_handlers'` and `'meta'`, which contain the values of the `request.upload_handlers` and `request.meta` properties. +Optional. If supplied, this argument will be a dictionary containing any additional context that may be required to parse the request content. + +By default this will include the following keys: `view`, `request`, `args`, `kwargs`. ## Example diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index c8addb32..24cca181 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -162,11 +162,14 @@ The request data, as set by the `Response()` instantiation. ### `media_type=None` -Optional. If provided, this is the accepted media type, as determined by the content negotiation stage. Depending on the client's `Accept:` header, this may be more specific than the renderer's `media_type` attribute, and may include media type parameters. For example `"application/json; nested=true"`. +Optional. If provided, this is the accepted media type, as determined by the content negotiation stage. + +Depending on the client's `Accept:` header, this may be more specific than the renderer's `media_type` attribute, and may include media type parameters. For example `"application/json; nested=true"`. ### `renderer_context=None` Optional. If provided, this is a dictionary of contextual information provided by the view. + By default this will include the following keys: `view`, `request`, `response`, `args`, `kwargs`. ## Example |