aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/request.py
diff options
context:
space:
mode:
authorTom Christie2012-10-17 22:39:07 +0100
committerTom Christie2012-10-17 22:39:07 +0100
commitfb56f215ae50da0aebe99e05036ece259fd3e6f1 (patch)
tree1566a18e4b4ad03a094c2c630b57d1530a9245d7 /rest_framework/request.py
parent4231995fbd80e45991975ab81d9e570a9f4b72d0 (diff)
downloaddjango-rest-framework-fb56f215ae50da0aebe99e05036ece259fd3e6f1.tar.bz2
Added `media_type` to `.parse()` - Consistency with renderer API.
Diffstat (limited to 'rest_framework/request.py')
-rw-r--r--rest_framework/request.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/rest_framework/request.py b/rest_framework/request.py
index d739d27d..b9d55de4 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -260,15 +260,19 @@ class Request(object):
May raise an `UnsupportedMediaType`, or `ParseError` exception.
"""
- if self.stream is None or self.content_type is None:
+ stream = self.stream
+ media_type = self.content_type
+
+ if stream is None or media_type is None:
return (None, None)
- parser = self.negotiator.select_parser(self.parsers, self.content_type)
+ parser = self.negotiator.select_parser(self.parsers, media_type)
if not parser:
- raise exceptions.UnsupportedMediaType(self.content_type)
+ raise exceptions.UnsupportedMediaType(media_type)
+
+ parsed = parser.parse(stream, media_type, self.parser_context)
- parsed = parser.parse(self.stream, self.parser_context)
# Parser classes may return the raw data, or a
# DataAndFiles object. Unpack the result as required.
try: