aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/viewsets.py
diff options
context:
space:
mode:
authorTom Christie2014-12-05 13:14:14 +0000
committerTom Christie2014-12-05 13:14:14 +0000
commit65d6cba75f9db0995020f01e9144b6660feb47d6 (patch)
tree1212187336ad9f887a4c69dc805506d49f42b86e /rest_framework/viewsets.py
parent9fb1b396db751234a531dabacb6758ac2645776c (diff)
parentd9930181ee157f51e2fcea33a3af5ea397647324 (diff)
downloaddjango-rest-framework-65d6cba75f9db0995020f01e9144b6660feb47d6.tar.bz2
Merge pull request #2200 from maryokhin/master
Clean up compat code
Diffstat (limited to 'rest_framework/viewsets.py')
-rw-r--r--rest_framework/viewsets.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py
index 70d14695..88c763da 100644
--- a/rest_framework/viewsets.py
+++ b/rest_framework/viewsets.py
@@ -44,7 +44,7 @@ class ViewSetMixin(object):
instantiated view, we need to totally reimplement `.as_view`,
and slightly modify the view function that is created and returned.
"""
- # The suffix initkwarg is reserved for identifing the viewset type
+ # The suffix initkwarg is reserved for identifying the viewset type
# eg. 'List' or 'Instance'.
cls.suffix = None
@@ -98,12 +98,12 @@ class ViewSetMixin(object):
view.suffix = initkwargs.get('suffix', None)
return csrf_exempt(view)
- def initialize_request(self, request, *args, **kargs):
+ def initialize_request(self, request, *args, **kwargs):
"""
Set the `.action` attribute on the view,
depending on the request method.
"""
- request = super(ViewSetMixin, self).initialize_request(request, *args, **kargs)
+ request = super(ViewSetMixin, self).initialize_request(request, *args, **kwargs)
self.action = self.action_map.get(request.method.lower())
return request