newforms-admin: Merged to [5571]

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5572 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 1 deletions

diff --git a/django/http/__init__.py b/django/http/__init__.py
index ca3b5eab24..1b2abe5049 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -162,7 +162,7 @@ class HttpResponse(object):
 
     status_code = 200
 
-    def __init__(self, content='', mimetype=None):
+    def __init__(self, content='', mimetype=None, status=None):
         from django.conf import settings
         self._charset = settings.DEFAULT_CHARSET
         if not mimetype:
@@ -175,6 +175,8 @@ class HttpResponse(object):
             self._is_string = True
         self.headers = {'Content-Type': mimetype}
         self.cookies = SimpleCookie()
+        if status:
+            self.status_code = status
 
     def __str__(self):
         "Full HTTP message, including headers"