aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/views.py
diff options
context:
space:
mode:
authorTom Christie2013-06-21 22:42:04 +0100
committerTom Christie2013-06-21 22:42:04 +0100
commit8cc63b09f6065e0197e060cc4d62b560196c8877 (patch)
tree3b8827f179369dbe07cd29a0ba4897328ee7d922 /rest_framework/views.py
parent4f7f93e20ef53fbc0b66766158bca75ebddce2ed (diff)
downloaddjango-rest-framework-8cc63b09f6065e0197e060cc4d62b560196c8877.tar.bz2
Add support for StreamingHttpResponse. Closes #939
Diffstat (limited to 'rest_framework/views.py')
-rw-r--r--rest_framework/views.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/rest_framework/views.py b/rest_framework/views.py
index c28d2835..37bba7f0 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -4,11 +4,11 @@ Provides an APIView class that is the base of all views in REST framework.
from __future__ import unicode_literals
from django.core.exceptions import PermissionDenied
-from django.http import Http404, HttpResponse
+from django.http import Http404
from django.utils.datastructures import SortedDict
from django.views.decorators.csrf import csrf_exempt
from rest_framework import status, exceptions
-from rest_framework.compat import View
+from rest_framework.compat import View, HttpResponseBase
from rest_framework.request import Request
from rest_framework.response import Response
from rest_framework.settings import api_settings
@@ -244,9 +244,10 @@ class APIView(View):
Returns the final response object.
"""
# Make the error obvious if a proper response is not returned
- assert isinstance(response, HttpResponse), (
- 'Expected a `Response` to be returned from the view, '
- 'but received a `%s`' % type(response)
+ assert isinstance(response, HttpResponseBase), (
+ 'Expected a `Response`, `HttpResponse` or `HttpStreamingResponse` '
+ 'to be returned from the view, but received a `%s`'
+ % type(response)
)
if isinstance(response, Response):