Merge branch 'master' of github.com:web2py/web2py

2013-09-11 11:22:21 -05:00
parent e060b2936f cc524592c4
commit b6f8f9be75
1 changed files with 5 additions and 6 deletions
@@ -4640,13 +4640,12 @@ class Service(object):

        def return_error(id, code, message=None, data=None):
            error = {'code': code}
-            if message is None:
-                error['message'] =  Service.jsonrpc_errors[code][0]
-            else:
-                error['message'] = message
-            if data is None:
+            if Service.jsonrpc_errors.has_key(code):
+                error['message'] = Service.jsonrpc_errors[code][0]
                error['data'] = Service.jsonrpc_errors[code][1]
-            else:
+            if message is not None:
+                error['message'] = message
+            if data is not None:
                error['data'] = data
            return serializers.json({'jsonrpc': '2.0',
                                     'id': id,