p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a failing test in special_headers, and performed a bit of cleanup. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2011-04-26 16:56:17 +00:00
parent 930371e91b
commit 2f9c52dc90
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/views/generic/base.py
View File

@ -44,8 +44,6 @@ class View(object):
def view(request, *args, **kwargs): def view(request, *args, **kwargs):
self = cls(**initkwargs) self = cls(**initkwargs)
if hasattr(self, 'get') and not hasattr(self, 'head'):
self.head = self.get
return self.dispatch(request, *args, **kwargs) return self.dispatch(request, *args, **kwargs)
# take name and docstring from class # take name and docstring from class
@ -79,6 +77,9 @@ class View(object):
) )
return http.HttpResponseNotAllowed(allowed_methods) return http.HttpResponseNotAllowed(allowed_methods)
def head(self, *args, **kwargs):
return self.get(*args, **kwargs)
class TemplateResponseMixin(object): class TemplateResponseMixin(object):
""" """

2
tests/regressiontests/special_headers/views.py
View File

@ -10,5 +10,5 @@ def xview(request):
return HttpResponse() return HttpResponse()
class XViewClass(View): class XViewClass(View):
def get(request): def get(self, request):
return HttpResponse() return HttpResponse()