Mercurial > kallithea

changeset 1661:fe5575f95850 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
API returns proper JSON response
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 08 Nov 2011 17:13:46 +0200
parents 5568b0cea3cc
children f62a960bae39
files rhodecode/controllers/api/__init__.py
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/api/__init__.py	Tue Nov 08 03:05:00 2011 +0200
+++ b/rhodecode/controllers/api/__init__.py	Tue Nov 08 17:13:46 2011 +0200
@@ -36,7 +36,7 @@
 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 @@
 
 
 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):