Django

Code

Changeset 6235

Show
Ignore:
Timestamp:
09/14/07 17:33:56 (1 year ago)
Author:
jacob
Message:

Added more dict-like methods to HttpResponse as part of the response.headers -> response._headers move, and fixed a few direct uses of response.headers in Django itself. Thanks to PhiR for tracking down and slaying these bugs.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/core/handlers/modpython.py

    r5629 r6235  
    160160        # Convert our custom HttpResponse object back into the mod_python req. 
    161161        req.content_type = response['Content-Type'] 
    162         for key, value in response.headers.items(): 
    163             if key != 'Content-Type': 
     162        for key, value in response.items(): 
     163            if key != 'content-type': 
    164164                req.headers_out[str(key)] = str(value) 
    165165        for c in response.cookies.values(): 
  • django/trunk/django/core/handlers/wsgi.py

    r5868 r6235  
    209209            status_text = 'UNKNOWN STATUS CODE' 
    210210        status = '%s %s' % (response.status_code, status_text) 
    211         response_headers = [(str(k), str(v)) for k, v in response.headers.items()] 
     211        response_headers = [(str(k), str(v)) for k, v in response.items()] 
    212212        for c in response.cookies.values(): 
    213213            response_headers.append(('Set-Cookie', str(c.output(header='')))) 
  • django/trunk/django/http/__init__.py

    r6225 r6235  
    275275 
    276276    __contains__ = has_header 
     277     
     278    def items(self): 
     279        return self._headers.items() 
     280     
     281    def get(self, header, alternate): 
     282        return self._headers.get(header, alternate) 
    277283 
    278284    def set_cookie(self, key, value='', max_age=None, expires=None, path='/', domain=None, secure=None): 
  • django/trunk/django/middleware/gzip.py

    r5875 r6235  
    2121        # Avoid gzipping if we've already got a content-encoding or if the 
    2222        # content-type is Javascript (silly IE...) 
    23         is_js = "javascript" in response.headers.get('Content-Type', '').lower() 
     23        is_js = "javascript" in response.get('Content-Type', '').lower() 
    2424        if response.has_header('Content-Encoding') or is_js: 
    2525            return response