queryset-refactor: Merged to [6250]

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6339 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 14 insertions, 6 deletions

diff --git a/django/http/__init__.py b/django/http/__init__.py
index 1bb1621d77..1b80237290 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -246,7 +246,7 @@ class HttpResponse(object):
         else:
             self._container = [content]
             self._is_string = True
-        self.headers = {'content-type': content_type}
+        self._headers = {'content-type': content_type}
         self.cookies = SimpleCookie()
         if status:
             self.status_code = status
@@ -254,24 +254,32 @@ class HttpResponse(object):
     def __str__(self):
         "Full HTTP message, including headers"
         return '\n'.join(['%s: %s' % (key, value)
-            for key, value in self.headers.items()]) \
+            for key, value in self._headers.items()]) \
             + '\n\n' + self.content
 
     def __setitem__(self, header, value):
-        self.headers[header.lower()] = value
+        self._headers[header.lower()] = value
 
     def __delitem__(self, header):
         try:
-            del self.headers[header.lower()]
+            del self._headers[header.lower()]
         except KeyError:
             pass
 
     def __getitem__(self, header):
-        return self.headers[header.lower()]
+        return self._headers[header.lower()]
 
     def has_header(self, header):
         "Case-insensitive check for a header"
-	return self.headers.has_key(header.lower())
+        return self._headers.has_key(header.lower())
+
+    __contains__ = has_header
+    
+    def items(self):
+        return self._headers.items()
+    
+    def get(self, header, alternate):
+        return self._headers.get(header, alternate)
 
     def set_cookie(self, key, value='', max_age=None, expires=None, path='/', domain=None, secure=None):
         self.cookies[key] = value