Ticket #9943: http-methods-and-statuses.diff

django/http/__init__.py

@@ -393 +393 @@
             raise Exception("This %s instance cannot tell its position" % self.__class__)
         return sum([len(chunk) for chunk in self._container])
 
-class HttpResponseRedirect(HttpResponse):
-    status_code = 302
-
+class _HttpResponseRedirection(HttpResponse):
     def __init__(self, redirect_to):
         HttpResponse.__init__(self)
         self['Location'] = iri_to_uri(redirect_to)
 
-class HttpResponsePermanentRedirect(HttpResponse):
+class HttpResponseContinue(HttpResponse):
+    status_code = 100
+
+class HttpResponseSwitchingProtocols(HttpResponse):
+    status_code = 101
+
+class HttpResponseCreated(HttpResponse):
+    status_code = 201
+
+class HttpResponseAccepted(HttpResponse):
+    status_code = 202
+
+class HttpResponseNonAuthoritativeInformation(HttpResponse):
+    status_code = 203
+
+class HttpResponseNoContent(HttpResponse):
+    status_code = 204
+
+class HttpResponseResetContent(HttpResponse):
+    status_code = 205
+
+class HttpResponsePartialContent(HttpResponse):
+    status_code = 206
+
+class HttpResponseMultipleChoices(HttpResponse):
+    status_code = 300
+
+class HttpResponsePermanentRedirect(_HttpResponseRedirection):
     status_code = 301
+HttpResponseMovedPermanently = HttpResponsePermanentRedirect
 
+class HttpResponseRedirect(_HttpResponseRedirection):
+    status_code = 302
+HttpResponseFound = HttpResponseRedirect
+
+class HttpResponseSeeOther(_HttpResponseRedirection):
+    status_code = 303
+
+class HttpResponseNotModified(HttpResponse):
+    status_code = 304
+
+class HttpResponseUseProxy(_HttpResponseRedirection):
+    status_code = 305
+
+class HttpResponseTemporaryRedirect(HttpResponse):
+    status_code = 307
+
     def __init__(self, redirect_to):
         HttpResponse.__init__(self)
         self['Location'] = iri_to_uri(redirect_to)
 
-class HttpResponseNotModified(HttpResponse):
-    status_code = 304
-
 class HttpResponseBadRequest(HttpResponse):
     status_code = 400
 
-class HttpResponseNotFound(HttpResponse):
-    status_code = 404
+class HttpResponseUnauthorized(HttpResponse):
+    status_code = 401
 
 class HttpResponseForbidden(HttpResponse):
     status_code = 403
 
+class HttpResponseNotFound(HttpResponse):
+    status_code = 404
+
 class HttpResponseNotAllowed(HttpResponse):
     status_code = 405
 
     def __init__(self, permitted_methods):
         HttpResponse.__init__(self)
         self['Allow'] = ', '.join(permitted_methods)
+HttpResponseMethodNotAllowed = HttpResponseNotAllowed
 
+class HttpResponseProxyAuthenticationRequired(HttpResponse):
+    status_code = 407
+
+class HttpResponseRequestTimeout(HttpResponse):
+    status_code = 408
+
+class HttpResponseConflict(HttpResponse):
+    status_code = 409
+
 class HttpResponseGone(HttpResponse):
     status_code = 410
 
-    def __init__(self, *args, **kwargs):
-        HttpResponse.__init__(self, *args, **kwargs)
+class HttpResponseLengthRequired(HttpResponse):
+    status_code = 411
 
+class HttpResponsePreconditionFailed(HttpResponse):
+    status_code = 412
+
+class HttpResponseRequestEntityTooLarge(HttpResponse):
+    status_code = 413
+
+class HttpResponseRequestURITooLong(HttpResponse):
+    status_code = 414
+
+class HttpResponseUnsupportedMediaType(HttpResponse):
+    status_code = 415
+
+class HttpResponseRequestedRangeNotSatisfiable(HttpResponse):
+    status_code = 416
+
+class HttpResponseExpectationFailed(HttpResponse):
+    status_code = 417
+
 class HttpResponseServerError(HttpResponse):
     status_code = 500
+HttpResponseInternalServerError = HttpResponseServerError
 
-    def __init__(self, *args, **kwargs):
-        HttpResponse.__init__(self, *args, **kwargs)
+class HttpResponseNotImplemented(HttpResponse):
+    status_code = 501
 
+class HttpResponseBadGateway(HttpResponse):
+    status_code = 502
+
+class HttpResponseServiceUnavailable(HttpResponse):
+    status_code = 503
+
+class HttpResponseGatewayTimeout(HttpResponse):
+    status_code = 504
+
+class HttpResponseHTTPVersionNotSupported(HttpResponse):
+    status_code = 505
+
 # A backwards compatible alias for HttpRequest.get_host.
 def get_host(request):
     return request.get_host()

django/views/decorators/http.py

@@ -32 +32 @@
         return wraps(func)(inner)
     return decorator
 
+# Pre-define a specific decorator for each method listed in the HTTP/1.1 RFC:
+# http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8
+
+_require_doc = "Decorator to require that a view only accept the %s method."
+
+require_CONNECT = require_http_methods(["CONNECT"])
+require_CONNECT.__doc__ = _require_doc % "CONNECT"
+
+require_DELETE = require_http_methods(["DELETE"])
+require_DELETE.__doc__ = _require_doc % "DELETE"
+
 require_GET = require_http_methods(["GET"])
-require_GET.__doc__ = "Decorator to require that a view only accept the GET method."
+require_GET.__doc__ = _require_doc % "GET"
 
+require_HEAD = require_http_methods(["HEAD"])
+require_HEAD.__doc__ = _require_doc % "HEAD"
+
+require_OPTIONS = require_http_methods(["OPTIONS"])
+require_OPTIONS.__doc__ = _require_doc % "OPTIONS"
+
 require_POST = require_http_methods(["POST"])
-require_POST.__doc__ = "Decorator to require that a view only accept the POST method."
- No newline at end of file
+require_POST.__doc__ = _require_doc % "POST"
+
+require_PUT = require_http_methods(["PUT"])
+require_PUT.__doc__ = _require_doc % "PUT"
+
+require_TRACE = require_http_methods(["TRACE"])
+require_TRACE.__doc__ = _require_doc % "TRACE"