Error object data may be ommited in output JSON if None; added Tests

Author: r3code

pyjsonrpclite/jsonrpc.py

@@ -223,6 +223,7 @@ def SubParseErrorResponse(jsondict):
 
         def SubParseJsonRpcObject(jsondict):
             '''Check if jsondict is valid JSON-RPC 2.0 object.
+            Raises `JsonRpcParseError` if parse/validation failed.
             Returns `JsonRpcParsed` object containing Parse results.'''
             try:
                 SubValidateHeader(jsondict)
@@ -271,8 +272,9 @@ class JsonRpcError(object):
 
     def __init__(self, code, message, data = None):
         self.code = code
-        self.message = message
-        self.data = data
+        self.message = message 
+        if not data is None:
+            self.data = data
 
     @classmethod
     def Error(cls, code, message, data = None): 

tests/test_jsonrpc.py

@@ -51,7 +51,7 @@ def testJsonRpcMessageErrorCorrect(self):
         actual = JsonRpcMessage.Error(1, JsonRpcError(-32001, 'Err MSG', [105, 106]))
         testutils.assertEqualObjects(expected, actual)
 
-    def testJsonRpcMessageAsJsonCorrect(self):    
+    def testJsonRpcMessageAsJsonCorrect(self):
         # request
         expected = '{\n"id": 1,\n"method": "login",\n"params": [\n"user",\n"password"\n]\n}'
         msg = JsonRpcMessage.Request(1, 'login', ['user', 'password'])
@@ -119,6 +119,24 @@ def testJsonRpcErrorResponseCorrect(self):
         self.assertEqual(msg.error.message, 'TestError')
         self.assertEqual(msg.error.data, 'Error-data')
 
+    def testInternalErrorCorrect1(self):
+        msg = JsonRpcError.InternalError('Error-data')
+        self.assertTrue(isinstance(msg, JsonRpcError))
+        self.assertTrue(hasattr(msg, 'code'))
+        self.assertTrue(hasattr(msg, 'message'))
+        self.assertTrue(hasattr(msg, 'data'))  
+        elf.assertEqual(-32603, msg.code)
+        elf.assertEqual('Internal Error', msg.message)
+        elf.assertEqual('Error-data', msg.data)
+
+    def testInternalErrorCorrect2(self):
+        msg = JsonRpcError.InternalError()
+        self.assertTrue(isinstance(msg, JsonRpcError))
+        self.assertTrue(hasattr(msg, 'code'))
+        self.assertTrue(hasattr(msg, 'message'))
+        elf.assertEqual(-32603, msg.code)
+        elf.assertEqual('Internal Error', msg.message)
+
     def testParseRequest(self):
         '''Checks if JSON-RPC 2.0 Request object parsed correct'''
         testReqJson = '''