Removed usage of mimetype kwarg of HttpResponse

Refs #16519.
This commit is contained in:
Claude Paroz 2012-06-30 21:19:07 +02:00
parent c446bdee84
commit deed192dda
5 changed files with 9 additions and 9 deletions

View File

@ -16,7 +16,7 @@ def render_to_response(*args, **kwargs):
Returns a HttpResponse whose content is filled with the result of calling Returns a HttpResponse whose content is filled with the result of calling
django.template.loader.render_to_string() with the passed arguments. django.template.loader.render_to_string() with the passed arguments.
""" """
httpresponse_kwargs = {'mimetype': kwargs.pop('mimetype', None)} httpresponse_kwargs = {'content_type': kwargs.pop('mimetype', None)}
return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs) return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs)
def render(request, *args, **kwargs): def render(request, *args, **kwargs):

View File

@ -101,4 +101,4 @@ def csrf_failure(request, reason=""):
'reason': reason, 'reason': reason,
'no_referer': reason == REASON_NO_REFERER 'no_referer': reason == REASON_NO_REFERER
}) })
return HttpResponseForbidden(t.render(c), mimetype='text/html') return HttpResponseForbidden(t.render(c), content_type='text/html')

View File

@ -63,10 +63,10 @@ def technical_500_response(request, exc_type, exc_value, tb):
reporter = ExceptionReporter(request, exc_type, exc_value, tb) reporter = ExceptionReporter(request, exc_type, exc_value, tb)
if request.is_ajax(): if request.is_ajax():
text = reporter.get_traceback_text() text = reporter.get_traceback_text()
return HttpResponseServerError(text, mimetype='text/plain') return HttpResponseServerError(text, content_type='text/plain')
else: else:
html = reporter.get_traceback_html() html = reporter.get_traceback_html()
return HttpResponseServerError(html, mimetype='text/html') return HttpResponseServerError(html, content_type='text/html')
# Cache for the default exception reporter filter instance. # Cache for the default exception reporter filter instance.
default_exception_reporter_filter = None default_exception_reporter_filter = None
@ -443,7 +443,7 @@ def technical_404_response(request, exception):
'request': request, 'request': request,
'settings': get_safe_settings(), 'settings': get_safe_settings(),
}) })
return HttpResponseNotFound(t.render(c), mimetype='text/html') return HttpResponseNotFound(t.render(c), content_type='text/html')
def empty_urlconf(request): def empty_urlconf(request):
"Create an empty URLconf 404 error response." "Create an empty URLconf 404 error response."
@ -451,7 +451,7 @@ def empty_urlconf(request):
c = Context({ c = Context({
'project_name': settings.SETTINGS_MODULE.split('.')[0] 'project_name': settings.SETTINGS_MODULE.split('.')[0]
}) })
return HttpResponse(t.render(c), mimetype='text/html') return HttpResponse(t.render(c), content_type='text/html')
# #
# Templates are embedded in the file so that we know the error handler will # Templates are embedded in the file so that we know the error handler will

View File

@ -58,9 +58,9 @@ def serve(request, path, document_root=None, show_indexes=False):
mimetype = mimetype or 'application/octet-stream' mimetype = mimetype or 'application/octet-stream'
if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'), if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
statobj.st_mtime, statobj.st_size): statobj.st_mtime, statobj.st_size):
return HttpResponseNotModified(mimetype=mimetype) return HttpResponseNotModified(content_type=mimetype)
with open(fullpath, 'rb') as f: with open(fullpath, 'rb') as f:
response = HttpResponse(f.read(), mimetype=mimetype) response = HttpResponse(f.read(), content_type=mimetype)
response["Last-Modified"] = http_date(statobj.st_mtime) response["Last-Modified"] = http_date(statobj.st_mtime)
if stat.S_ISREG(statobj.st_mode): if stat.S_ISREG(statobj.st_mode):
response["Content-Length"] = statobj.st_size response["Content-Length"] = statobj.st_size

View File

@ -84,7 +84,7 @@ def return_json_file(request):
cls=DjangoJSONEncoder, cls=DjangoJSONEncoder,
ensure_ascii=False) ensure_ascii=False)
response = HttpResponse(obj_json.encode(charset), status=200, response = HttpResponse(obj_json.encode(charset), status=200,
mimetype='application/json; charset=%s' % charset) content_type='application/json; charset=%s' % charset)
response['Content-Disposition'] = 'attachment; filename=testfile.json' response['Content-Disposition'] = 'attachment; filename=testfile.json'
return response return response