Context Navigation

Ticket #7453: 7453.diff

File 7453.diff, 1.9 KB (added by Marc Fargas, 16 years ago)
Fix.

diff --git a/django/http/__init__.py b/django/http/__init__.py
index 7faa3c8..2bd04fb 100644

                class HttpResponse(object):
     status_code = 200
     def __init__(self, content='', mimetype=None, status=None,
+    def __init__(self, content='', mimetype=None, status_code=None,
             content_type=None):
         from django.conf import settings
         self._charset = settings.DEFAULT_CHARSET
-…
+               class HttpResponse(object):
             self._container = [content]
             self._is_string = True
         self.cookies = SimpleCookie()
         if status:
             self.status_code = status
+        if status_code:
+            self.status_code = status_code
         # _headers is a mapping of the lower-case name to the original case of
         # the header (required for working with legacy systems) and the header

diff --git a/docs/request_response.txt b/docs/request_response.txt
index 866a697..64e96de 100644

                it's easy to forget the syntax, so we've included it here.
 Methods
 -------
 ``__init__(content='', mimetype=None, status=200, content_type=DEFAULT_CONTENT_TYPE)``
+``__init__(content='', mimetype=None, status_code=200, content_type=DEFAULT_CONTENT_TYPE)``
     Instantiates an ``HttpResponse`` object with the given page content (a
     string) and MIME type. The ``DEFAULT_CONTENT_TYPE`` is ``'text/html'``.
-…
+               Methods
     return strings, and those strings will be joined together to form the
     content of the response.
     ``status`` is the `HTTP Status code`_ for the response.
+    ``status_code`` is the `HTTP Status code`_ for the response.
     **(New in Django development version)** ``content_type`` is an alias for
     ``mimetype``. Historically, the parameter was only called ``mimetype``,