# HG changeset patch # User Marcin Kuzminski # Date 2011-11-08 16:13:46 # Node ID fe5575f958503bc0aa82efd4690ab39bbfc1982a # Parent 5568b0cea3cca7a3bd9e8d966ebc28e400ad3f26 API returns proper JSON response diff --git a/rhodecode/controllers/api/__init__.py b/rhodecode/controllers/api/__init__.py --- a/rhodecode/controllers/api/__init__.py +++ b/rhodecode/controllers/api/__init__.py @@ -36,7 +36,7 @@ from rhodecode.lib.compat import izip_lo from paste.response import replace_header from pylons.controllers import WSGIController -from pylons.controllers.util import Response + from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \ HTTPBadRequest, HTTPError @@ -56,9 +56,15 @@ class JSONRPCError(BaseException): def jsonrpc_error(message, code=None): - """Generate a Response object with a JSON-RPC error body""" - return Response(body=json.dumps(dict(result=None, - error=message))) + """ + Generate a Response object with a JSON-RPC error body + """ + from pylons.controllers.util import Response + resp = Response(body=json.dumps(dict(result=None, error=message)), + status=code, + content_type='application/json') + return resp + class JSONRPCController(WSGIController):