Ticket #1569: 1569.trunk.diff

File 1569.trunk.diff, 5.1 KB (added by Maniac <Maniac@…>, 9 years ago)

Patch for trunk

  • django/utils/httpwrappers.py

     
    22from pprint import pformat
    33from urllib import urlencode
    44from django.utils.datastructures import MultiValueDict
     5from django.conf.settings import DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET
    56
    67try:
    78    # The mod_python version is more efficient, so try importing it first.
     
    143144        cookiedict[key] = c.get(key).value
    144145    return cookiedict
    145146
    146 class HttpResponse:
     147class HttpResponse(object):
    147148    "A basic HTTP response, with content and dictionary-accessed headers"
    148149    def __init__(self, content='', mimetype=None):
    149150        if not mimetype:
    150             from django.conf.settings import DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET
    151151            mimetype = "%s; charset=%s" % (DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET)
    152         self.content = content
     152        if hasattr(content,'__iter__'):
     153            self.iterator = content
     154            self._is_string = False
     155        else:
     156            self.iterator = [content]
     157            self._is_string = True
    153158        self.headers = {'Content-Type':mimetype}
    154159        self.cookies = SimpleCookie()
    155160        self.status_code = 200
     
    193198        except KeyError:
    194199            pass
    195200
    196     def get_content_as_string(self, encoding):
    197         """
    198         Returns the content as a string, encoding it from a Unicode object if
    199         necessary.
    200         """
    201         if isinstance(self.content, unicode):
    202             return self.content.encode(encoding)
    203         return self.content
     201    def _get_content(self):
     202        content = ''.join(self.iterator)
     203        if isinstance(content, unicode):
     204            content = content.encode(DEFAULT_CHARSET)
     205        return content
    204206
     207    def _set_content(self, value):
     208        self.iterator = [value]
     209        self._is_string = True
     210
     211    content = property(_get_content,_set_content)
     212
    205213    # The remaining methods partially implement the file-like object interface.
    206214    # See http://docs.python.org/lib/bltin-file-objects.html
    207215    def write(self, content):
    208         self.content += content
     216        if not self._is_string:
     217            raise Exception, "This %s instance is not writable"%self.__class__
     218        self.iterator.append(content)
    209219
    210220    def flush(self):
    211221        pass
    212222
    213223    def tell(self):
    214         return len(self.content)
     224        if not self._is_string:
     225            raise Exception, "This %s instance cannot tell its position"%self.__class__
     226        return sum(len(chunk) for chunk in self.iterator)
    215227
    216228class HttpResponseRedirect(HttpResponse):
    217229    def __init__(self, redirect_to):
  • django/utils/cache.py

     
    7474        cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
    7575    now = datetime.datetime.utcnow()
    7676    if not response.has_header('ETag'):
    77         response['ETag'] = md5.new(response.get_content_as_string('utf8')).hexdigest()
     77        response['ETag'] = md5.new(response.content).hexdigest()
    7878    if not response.has_header('Last-Modified'):
    7979        response['Last-Modified'] = now.strftime('%a, %d %b %Y %H:%M:%S GMT')
    8080    if not response.has_header('Expires'):
  • django/core/handlers/wsgi.py

     
    172172        response_headers = response.headers.items()
    173173        for c in response.cookies.values():
    174174            response_headers.append(('Set-Cookie', c.output(header='')))
    175         output = [response.get_content_as_string(settings.DEFAULT_CHARSET)]
    176175        start_response(status, response_headers)
    177         return output
     176        return response.iterator
  • django/core/handlers/modpython.py

     
    162162    for c in http_response.cookies.values():
    163163        mod_python_req.headers_out.add('Set-Cookie', c.output(header=''))
    164164    mod_python_req.status = http_response.status_code
    165     mod_python_req.write(http_response.get_content_as_string(settings.DEFAULT_CHARSET))
     165    for chunk in http_response.iterator:
     166        mod_python_req.write(chunk)
    166167
    167168def handler(req):
    168169    # mod_python hooks into this function.
  • django/middleware/common.py

     
    6767
    6868        # Use ETags, if requested.
    6969        if settings.USE_ETAGS:
    70             etag = md5.new(response.get_content_as_string(settings.DEFAULT_CHARSET)).hexdigest()
     70            etag = md5.new(response.content).hexdigest()
    7171            if request.META.get('HTTP_IF_NONE_MATCH') == etag:
    7272                response = httpwrappers.HttpResponseNotModified()
    7373            else:
Back to Top