dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forward compatibility with jsonrpc-2.0 for @service.jsonrpc annotation.

Browse Source
This commit is contained in:
Michele Comitini
2013-01-19 23:51:30 +01:00
parent bc44bb0fe9
commit 10193dd014
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+4 -3
View File
@@ -4308,9 +4308,9 @@ class Service(object):
response.headers['Content-Type'] = 'application/json; charset=utf-8' response.headers['Content-Type'] = 'application/json; charset=utf-8'
methods = self.jsonrpc_procedures methods = self.jsonrpc_procedures
data = json_parser.loads(request.body.read()) data = json_parser.loads(request.body.read())
jsonrpc_2 = dataget('jsonrpc') jsonrpc_2 = data.get('jsonrpc')
if jsonrpc_2: #hand over to version 2 of the protocol if jsonrpc_2: #hand over to version 2 of the protocol
self.serve_jsonrpc2(data) return self.serve_jsonrpc2(data)
id, method, params = data['id'], data['method'], data.get('params', '') id, method, params = data['id'], data['method'], data.get('params', '')
if not method in methods: if not method in methods:
return return_error(id, 100, 'method "%s" does not exist' % method) return return_error(id, 100, 'method "%s" does not exist' % method)
@@ -4386,17 +4386,18 @@ class Service(object):
methods = self.jsonrpc2_procedures
if not data: if not data:
request = current.request request = current.request
response = current.response response = current.response
response.headers['Content-Type'] = 'application/json; charset=utf-8' response.headers['Content-Type'] = 'application/json; charset=utf-8'
methods = self.jsonrpc2_procedures
try: try:
data = json_parser.loads(request.body.read()) data = json_parser.loads(request.body.read())
except ValueError: # decoding error in json lib except ValueError: # decoding error in json lib
return return_error(None, -32700) return return_error(None, -32700)
except json_parser.JSONDecodeError: # decoding error in simplejson lib except json_parser.JSONDecodeError: # decoding error in simplejson lib
return return_error(None, -32700) return return_error(None, -32700)
methods.update(self.jsonrpc_procedures)
try: try:
must_respond = validate(data) must_respond = validate(data)
except Service.JsonRpcException, e: except Service.JsonRpcException, e: