aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/request.py
diff options
context:
space:
mode:
authorMark Aaron Shirley2013-05-08 22:39:48 -0700
committerMark Aaron Shirley2013-05-08 22:39:48 -0700
commite550740b3d07e9f89e89941ee6be1101c7770e9a (patch)
tree7e26d3e76479f16302e2fade1890c35fe3c1b445 /rest_framework/request.py
parent7e0a93f0eefead25f0e9b6615675f394af3a4ba0 (diff)
parent4ab7b8f257f9d3a1b35d34d0f90f0103b0cc6369 (diff)
downloaddjango-rest-framework-e550740b3d07e9f89e89941ee6be1101c7770e9a.tar.bz2
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts: rest_framework/tests/relations_nested.py
Diffstat (limited to 'rest_framework/request.py')
-rw-r--r--rest_framework/request.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/rest_framework/request.py b/rest_framework/request.py
index ffbbab33..a434659c 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -1,11 +1,10 @@
"""
-The :mod:`request` module provides a :class:`Request` class used to wrap the standard `request`
-object received in all the views.
+The Request class is used as a wrapper around the standard request object.
The wrapped request then offers a richer API, in particular :
- content automatically parsed according to `Content-Type` header,
- and available as :meth:`.DATA<Request.DATA>`
+ and available as `request.DATA`
- full support of PUT method, including support for file uploads
- form overloading of HTTP method, content type and content
"""