Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[soc2009/http-wsgi-improvements] Update the render_to_response shortc…

…ut to pass request and content_type to HttpResponse, to support Accept-Charset. Refs #10190.

Also updates docs.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1da736f0f9f3c2bff93fac15f87ced56df5df21e 1 parent edcc1c2
@ccahoon ccahoon authored
Showing with 18 additions and 4 deletions.
  1. +3 −2 django/shortcuts/__init__.py
  2. +15 −2 docs/topics/http/shortcuts.txt
View
5 django/shortcuts/__init__.py
@@ -11,12 +11,13 @@
from django.db.models.query import QuerySet
from django.core import urlresolvers
+accepted_kwargs = ('content_type', 'mimetype', 'request')
def render_to_response(*args, **kwargs):
"""
Returns a HttpResponse whose content is filled with the result of calling
django.template.loader.render_to_string() with the passed arguments.
"""
- httpresponse_kwargs = {'mimetype': kwargs.pop('mimetype', None)}
+ httpresponse_kwargs = dict([(k, kwargs.pop(k, None)) for k in accepted_kwargs])
return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs)
def redirect(to, *args, **kwargs):
@@ -98,4 +99,4 @@ def get_list_or_404(klass, *args, **kwargs):
obj_list = list(queryset.filter(*args, **kwargs))
if not obj_list:
raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
- return obj_list
+ return obj_list
View
17 docs/topics/http/shortcuts.txt
@@ -17,7 +17,7 @@ introduce controlled coupling for convenience's sake.
``render_to_response``
======================
-.. function:: render_to_response(template[, dictionary][, context_instance][, mimetype])
+.. function:: render_to_response(template[, dictionary][, context_instance][, mimetype, content_type, status])
Renders a given template with a given context dictionary and returns an
:class:`~django.http.HttpResponse` object with that rendered text.
@@ -48,12 +48,25 @@ Optional arguments
my_data_dictionary,
context_instance=RequestContext(request))
+``content_type``
+ .. versionadded:: 1.2
+
+ The value for the Content-Type header to use in the resulting document. Can
+ also contain a MIME type. Defaults to the value of the :setting:`DEFAULT_CONTENT_TYPE` setting.
+
``mimetype``
.. versionadded:: 1.0
- The MIME type to use for the resulting document. Defaults to the value of
+ Alias for content_type, for backwards compatibility. Defaults to the value of
the :setting:`DEFAULT_CONTENT_TYPE` setting.
+``request``
+ .. versionadded:: 1.2
+
+ The request can be passed to HttpResponse for handling the Accept-Charset
+ header, which allows clients to specify the encoding in which they wish to
+ receive the content.
+
Example
-------
Please sign in to comment.
Something went wrong with that request. Please try again.