Ticket #10504: tkt-10504.diff

django/shortcuts/__init__.py

@@ -16 +16 @@
     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 = {'mimetype': kwargs.pop('mimetype', None),
+                           'content_type': kwargs.pop('content_type', None)}
     return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs)
 
 def render(request, *args, **kwargs):

docs/topics/http/shortcuts.txt

@@ -127 +127 @@
     The MIME type to use for the resulting document. Defaults to the value of
     the :setting:`DEFAULT_CONTENT_TYPE` setting.
 
+``content_type``
+
+    .. versionadded:: 1.4
+
+    An alias for ``mimetype`` that corresponds more closely to the HTTP header
+    Content-Type.
+
 Example
 -------
 

tests/regressiontests/views/generic_urls.py

@@ -100 +100 @@
     (r'^shortcuts/render_to_response/$', 'render_to_response_view'),
     (r'^shortcuts/render_to_response/request_context/$', 'render_to_response_view_with_request_context'),
     (r'^shortcuts/render_to_response/mimetype/$', 'render_to_response_view_with_mimetype'),
+        (r'^shortcuts/render_to_response/content_type/$', 'render_to_response_view_with_content_type'),
     (r'^shortcuts/render/$', 'render_view'),
     (r'^shortcuts/render/base_context/$', 'render_view_with_base_context'),
     (r'^shortcuts/render/content_type/$', 'render_view_with_content_type'),

tests/regressiontests/views/tests/shortcuts.py

@@ -44 +44 @@
         self.assertEqual(response.content, 'FOO.BAR..\n')
         self.assertEqual(response['Content-Type'], 'application/x-rendertest')
 
+    def test_render_to_response_with_contenttype(self):
+        response = self.client.get('/shortcuts/render_to_response/content_type/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, 'FOO.BAR..\n')
+        self.assertEqual(response['Content-Type'], 'application/x-rendertest')
+
     def test_render(self):
         response = self.client.get('/shortcuts/render/')
         self.assertEqual(response.status_code, 200)

tests/regressiontests/views/views.py

@@ -91 +91 @@
         'bar': 'BAR',
     }, mimetype='application/x-rendertest')
 
+def render_to_response_view_with_content_type(request):
+    return render_to_response('debug/render_test.html', {
+        'foo': 'FOO',
+        'bar': 'BAR',
+    }, content_type='application/x-rendertest')
+
 def render_view(request):
     return render(request, 'debug/render_test.html', {
         'foo': 'FOO',