[soc2009/http-wsgi-improvements] Add docs that I missed from the patch and reformat HttpResponse.__str__. refs django#6527

ccahoon · ccahoon · commit aeaa921a6d3c · 2009-07-17T12:36:29.000Z
This and the previous revision on this branch appear to complete all the changes from django#6527. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/http/__init__.py b/django/http/__init__.py
@@ -288,6 +288,7 @@ def __init__(self, content='', mimetype=None, status=None,
         if not content_type:
             content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
                     self._charset)
+        # Expects content to be an iterable container or a string.
         self._container = [''.join(content)]
         if hasattr(content, 'close'):
             content.close()
@@ -301,8 +302,8 @@ def __init__(self, content='', mimetype=None, status=None,
 
     def __str__(self):
         """Full HTTP message, including headers."""
-        headers = ['%s: %s' % (k, v) for k, v in self._headers.values()]
-        return '\n'.join(headers) + '\n\n' + self.content
+        return '\n'.join(['%s: %s' % (k, v) for k, v in self._headers.values()]) \
+               + "\n\n" + self.content
 
     def _convert_to_ascii(self, *values):
         """Converts all values to ascii strings."""
@@ -414,7 +415,7 @@ def next(self):
         return str(chunk)
 
     def close(self):
-        "No-op that remains for backwards compatibility. Ref #6527"
+        "No-op. Remains for backwards compatibility. Refs #6527"
         pass
 
     # The remaining methods partially implement the file-like object interface.
