Ticket #9403: httpResp_set_content.diff

django/http/__init__.py

@@ -277 +277 @@
         if not content_type:
             content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
                     settings.DEFAULT_CHARSET)
-        if not isinstance(content, basestring) and hasattr(content, '__iter__'):
-            self._container = content
-            self._is_string = False
-        else:
-            self._container = [content]
-            self._is_string = True
+                    
+        self.content = content
         self.cookies = SimpleCookie()
         if status:
             self.status_code = status
@@ -359 +355 @@
         return smart_str(''.join(self._container), self._charset)
 
     def _set_content(self, value):
-        self._container = [value]
-        self._is_string = True
-
+        if not isinstance(value, basestring) and hasattr(value, '__iter__'):
+            self._container = value
+            self._is_string = False
+        else:
+            self._container = [value]
+            self._is_string = True
+        
     content = property(_get_content, _set_content)
 
     def __iter__(self):