aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/views.py
diff options
context:
space:
mode:
authorTom Christie2012-09-03 16:54:17 +0100
committerTom Christie2012-09-03 16:54:17 +0100
commita092a72844705e3129b8996b81d8424997b5d37f (patch)
tree2f9cf30fc805a4b8cf4e6d60b3f820a3e96347e3 /djangorestframework/views.py
parent1a1ccf94c2c0cadee8b0bd1c8f85c591c650d763 (diff)
downloaddjango-rest-framework-a092a72844705e3129b8996b81d8424997b5d37f.tar.bz2
View -> APIView
Diffstat (limited to 'djangorestframework/views.py')
-rw-r--r--djangorestframework/views.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/djangorestframework/views.py b/djangorestframework/views.py
index 10b0dccb..389f2044 100644
--- a/djangorestframework/views.py
+++ b/djangorestframework/views.py
@@ -12,7 +12,7 @@ from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.views.decorators.csrf import csrf_exempt
-from djangorestframework.compat import View, apply_markdown
+from djangorestframework.compat import View as _View, apply_markdown
from djangorestframework.response import Response
from djangorestframework.request import Request
from djangorestframework.settings import api_settings
@@ -62,7 +62,7 @@ def _camelcase_to_spaces(content):
return re.sub(camelcase_boundry, ' \\1', content).strip()
-class APIView(View):
+class APIView(_View):
"""
Handles incoming requests and maps them to REST operations.
Performs request deserialization, response serialization, authentication and input validation.
@@ -96,7 +96,7 @@ class APIView(View):
as an attribute on the callable function. This allows us to discover
information about the view when we do URL reverse lookups.
"""
- view = super(View, cls).as_view(**initkwargs)
+ view = super(APIView, cls).as_view(**initkwargs)
view.cls_instance = cls(**initkwargs)
return view