summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/views/generic/base.py5
-rw-r--r--tests/regressiontests/special_headers/views.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
index 4e28b5280d..6b5256779f 100644
--- a/django/views/generic/base.py
+++ b/django/views/generic/base.py
@@ -44,8 +44,6 @@ class View(object):
def view(request, *args, **kwargs):
self = cls(**initkwargs)
- if hasattr(self, 'get') and not hasattr(self, 'head'):
- self.head = self.get
return self.dispatch(request, *args, **kwargs)
# take name and docstring from class
@@ -79,6 +77,9 @@ class View(object):
)
return http.HttpResponseNotAllowed(allowed_methods)
+ def head(self, *args, **kwargs):
+ return self.get(*args, **kwargs)
+
class TemplateResponseMixin(object):
"""
diff --git a/tests/regressiontests/special_headers/views.py b/tests/regressiontests/special_headers/views.py
index 7ec99ad4e1..ce940363ea 100644
--- a/tests/regressiontests/special_headers/views.py
+++ b/tests/regressiontests/special_headers/views.py
@@ -10,5 +10,5 @@ def xview(request):
return HttpResponse()
class XViewClass(View):
- def get(request):
+ def get(self, request):
return HttpResponse()