Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions rest_framework/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@ class Request(object):

def __init__(self, request, parsers=None, authenticators=None,
negotiator=None, parser_context=None):
# If we're being passed our own Request object, unwrap the underlying
# HttpRequest. This allows for some backwards compatibilty to 3.7.3
# for select users who carefully reuse ViewSets.
if isinstance(request, Request):
request = request._request

assert isinstance(request, HttpRequest), (
'The `request` argument must be an instance of '
'`django.http.HttpRequest`, not `{}.{}`.'
Expand Down
7 changes: 5 additions & 2 deletions tests/test_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@ def test_request_type(self):

message = (
'The `request` argument must be an instance of '
'`django.http.HttpRequest`, not `rest_framework.request.Request`.'
'`django.http.HttpRequest`, not `NoneType`.'
)
with self.assertRaisesMessage(AssertionError, message):
Request(request)
Request(None)

other_request = Request(request)
assert other_request._request is request._request


class PlainTextParser(BaseParser):
Expand Down