mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/http-wsgi-improvements] Added the codec attribute/property to HttpResponse, and added docs for recent work with charsets/codecs.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Cahoon 2009-07-11 02:00:34 +00:00
parent c53880e2c1
commit bf66b536a2
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/http/__init__.py
View File

@ -373,6 +373,15 @@ class HttpResponse(object):
if not self._codec: if not self._codec:
self._codec = UnsupportedCharset self._codec = UnsupportedCharset
def _get_codec(self):
return self._codec
def _set_codec(self, value):
if hasattr(value, "name"):
self._codec = value
codec = property(_get_codec, _set_codec)
def _get_status_code(self): def _get_status_code(self):
self._configure_body_encoding() self._configure_body_encoding()
if self._codec is UnsupportedCharset: if self._codec is UnsupportedCharset:

15
docs/ref/request-response.txt
View File

@ -471,10 +471,19 @@ Attributes
A normal Python string representing the content, encoded from a Unicode A normal Python string representing the content, encoded from a Unicode
object if necessary. object if necessary.
.. attribute :: HttpResponse.codec
A class that contains the attribute ``name``, which contains an alias or
name of a codec (from the module ``codecs``) that will be used to encode
the response content. This value is set automatically in response to a
``request`` argument that contains an Accept-Charset header or content_type
argument that contains a charset value. The priority for setting the codec/
charset is specified in HttpResponse.charsets.
Methods Methods
------- -------
.. method:: HttpResponse.__init__(content='', mimetype=None, status=200, content_type=DEFAULT_CONTENT_TYPE) .. method:: HttpResponse.__init__(content='', mimetype=None, status=200, content_type=DEFAULT_CONTENT_TYPE, request=None)
Instantiates an ``HttpResponse`` object with the given page content (a Instantiates an ``HttpResponse`` object with the given page content (a
string) and MIME type. The ``DEFAULT_CONTENT_TYPE`` is ``'text/html'``. string) and MIME type. The ``DEFAULT_CONTENT_TYPE`` is ``'text/html'``.
@ -495,6 +504,10 @@ Methods
Otherwise, ``content_type`` is used. If neither is given, the Otherwise, ``content_type`` is used. If neither is given, the
``DEFAULT_CONTENT_TYPE`` setting is used. ``DEFAULT_CONTENT_TYPE`` setting is used.
``request`` is the request that triggered this response. It can be used in
the event that a view cares about dealing with request headers, in
particular the Accept-Charset header.
.. method:: HttpResponse.__setitem__(header, value) .. method:: HttpResponse.__setitem__(header, value)
Sets the given header name to the given value. Both ``header`` and Sets the given header name to the given value. Both ``header`` and