Ticket #7453: 7453.backwards.diff

django/http/__init__.py

@@ -259 +259 @@
 
     status_code = 200
 
-    def __init__(self, content='', mimetype=None, status=None,
-            content_type=None):
+    def __init__(self, content='', mimetype=None, status_code=None,
+            content_type=None, status=None):
         from django.conf import settings
         self._charset = settings.DEFAULT_CHARSET
         if mimetype:
@@ -275 +275 @@
             self._container = [content]
             self._is_string = True
         self.cookies = SimpleCookie()
-        if status:
-            self.status_code = status
+        if status_code and status:
+            raise ValueError, "You cannot set both status_code and status, note that status is deprecated."
+        elif status:
+            from warnings import warn
+            warn("The status parameter is deprecated, please use status_code instead.",
+                DeprecationWarning)
+            status_code = status
+        elif 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

docs/request_response.txt

@@ -426 +426 @@
 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'``.
 
@@ -434 +434 @@
     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``,