Skip to content
Merged
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
8 changes: 7 additions & 1 deletion rest_framework/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from __future__ import unicode_literals

from django.conf import settings
from django.http import QueryDict
from django.http import HttpRequest, QueryDict
from django.http.multipartparser import parse_header
from django.http.request import RawPostDataException
from django.utils import six
Expand Down Expand Up @@ -132,6 +132,12 @@ class Request(object):

def __init__(self, request, parsers=None, authenticators=None,
negotiator=None, parser_context=None):
assert isinstance(request, HttpRequest), (
'The `request` argument must be an instance of '
'`django.http.HttpRequest`, not `{}.{}`.'
.format(request.__class__.__module__, request.__class__.__name__)
)

self._request = request
self.parsers = parsers or ()
self.authenticators = authenticators or ()
Expand Down
3 changes: 1 addition & 2 deletions tests/test_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
exceptions, metadata, serializers, status, versioning, views
)
from rest_framework.renderers import BrowsableAPIRenderer
from rest_framework.request import Request
from rest_framework.test import APIRequestFactory

from .models import BasicModel

request = Request(APIRequestFactory().options('/'))
request = APIRequestFactory().options('/')


class TestMetadata:
Expand Down
12 changes: 12 additions & 0 deletions tests/test_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@
factory = APIRequestFactory()


class TestInitializer(TestCase):
def test_request_type(self):
request = Request(factory.get('/'))

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


class PlainTextParser(BaseParser):
media_type = 'text/plain'

Expand Down