From: Thierry Parmentelat Date: Tue, 31 Mar 2015 14:38:21 +0000 (+0200) Subject: HttpResponse expects content_type, mimetype was an old thing and was removed in 1.7 X-Git-Tag: myslice-1.3~45^2~1 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=c4824dd65364b1ba6c9d3f45a9b6298dfafad0bc HttpResponse expects content_type, mimetype was an old thing and was removed in 1.7 --- diff --git a/manifoldapi/manifoldproxy.py b/manifoldapi/manifoldproxy.py index 5a095bfc..a5bc20da 100644 --- a/manifoldapi/manifoldproxy.py +++ b/manifoldapi/manifoldproxy.py @@ -38,14 +38,14 @@ def proxy (request,format): # expecting a POST if request.method != 'POST': logger.error("MANIFOLDPROXY unexpected method {} -- exiting".format(request.method)) - return HttpResponse ({"ret":0}, mimetype="application/json") + return HttpResponse ({"ret":0}, content_type="application/json") # we only support json for now # if needed in the future we should probably cater for # format_in : how is the query encoded in POST # format_out: how to serve the results if format != 'json': logger.error("MANIFOLDPROXY unexpected format {} -- exiting".format(format)) - return HttpResponse ({"ret":0}, mimetype="application/json") + return HttpResponse ({"ret":0}, content_type="application/json") try: # translate incoming POST request into a query object #logger.debug("MANIFOLDPROXY request.POST {}".format(request.POST)) @@ -63,10 +63,10 @@ def proxy (request,format): else: manifold_api_session_auth = SessionCache().get_auth(request) if not manifold_api_session_auth: - return HttpResponse (json.dumps({'code':0,'value':[]}), mimetype="application/json") + return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json") if debug_empty and manifold_query.action.lower()=='get': - return HttpResponse (json.dumps({'code':0,'value':[]}), mimetype="application/json") + return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json") # actually forward manifold_api= ManifoldAPI(auth=manifold_api_session_auth) @@ -101,13 +101,13 @@ def proxy (request,format): json_answer=json.dumps(result) - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json") except Exception as e: logger.error("MANIFOLDPROXY {}".format(e)) import traceback logger.error(traceback.format_exc()) - return HttpResponse ({"ret":0}, mimetype="application/json") + return HttpResponse ({"ret":0}, content_type="application/json") #################### # see CSRF_FAILURE_VIEW in settings.py @@ -116,4 +116,4 @@ def proxy (request,format): failure_answer=[ "csrf_failure" ] def csrf_failure(request, reason=""): logger.error("CSRF failure with reason '{}'".format(reason)) - return HttpResponseForbidden (json.dumps (failure_answer), mimetype="application/json") + return HttpResponseForbidden (json.dumps (failure_answer), content_type="application/json") diff --git a/portal/actions.py b/portal/actions.py index 7d57b9d6..e6dd0ea5 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -628,14 +628,14 @@ def validate_action(request, **kwargs): ids = filter(None, kwargs['id'].split('/')) status = portal_validate_request(request, ids) json_answer = json.dumps(status) - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json") def reject_action(request, **kwargs): ids = filter(None, kwargs['id'].split('/')) status = portal_reject_request(request, ids) json_answer = json.dumps(status) - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json") def portal_reject_request(wsgi_request, request_ids): diff --git a/portal/reputationview.py b/portal/reputationview.py index fcc5ff06..a08ad463 100644 --- a/portal/reputationview.py +++ b/portal/reputationview.py @@ -22,7 +22,7 @@ from django.views.decorators.csrf import csrf_exempt from django.http import * -def response_mimetype(request): +def response_content_type(request): if "application/json" in request.META['HTTP_ACCEPT']: return "application/json" @@ -233,7 +233,7 @@ class ReputationView (LoginRequiredAutoLogoutView, ThemeView): slicedata_received = json_to_rest('http://survivor.lab.netmode.ntua.gr:4567/reputation/json', dict_to_send ) - return HttpResponse(json.dumps(slicedata_received), content_type = response_mimetype(self.request)) + return HttpResponse(json.dumps(slicedata_received), content_type = response_content_type(self.request)) slices_users = [] @@ -376,4 +376,4 @@ class ReputationView (LoginRequiredAutoLogoutView, ThemeView): - \ No newline at end of file + diff --git a/portal/views/__init__.py b/portal/views/__init__.py index d58593cf..7ed4e082 100644 --- a/portal/views/__init__.py +++ b/portal/views/__init__.py @@ -139,7 +139,7 @@ def pres_view_methods(request, type): config.close() else: return 0 - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json") def pres_view_animation(request, constraints, id): @@ -184,7 +184,7 @@ def pres_view_animation(request, constraints, id): }] json_answer = json.dumps(cmd) - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json") def pres_view_static(request, constraints, id): #constraints = "']date_created':1262325600" @@ -221,4 +221,4 @@ def pres_view_static(request, constraints, id): }] json_answer = json.dumps(cmd) - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json")