Merge lp:~jerith/txjsonrpc/jsonrpc-2.0-support into lp:txjsonrpc

[Jeremy Thurgood]

This builds correctly formatted responses for jsonrpc 2.0 requests.

[lp:~jerith/txjsonrpc/jsonrpc-2.0-support]

96. By Jeremy Thurgood on 2013-07-30

Default to v1.0, not the pre-spec behaviour.

Unmerged revisions

96. By Jeremy Thurgood on 2013-07-30

Default to v1.0, not the pre-spec behaviour.

95. By Jeremy Thurgood on 2013-07-30

Support v2.0 output.

=== modified file 'txjsonrpc/jsonrpclib.py'
--- txjsonrpc/jsonrpclib.py	2012-01-28 01:11:15 +0000
+++ txjsonrpc/jsonrpclib.py	2013-07-30 14:14:25 +0000
@@ -66,7 +66,13 @@
     else:
         result = obj
         error = None
-    if version == VERSION_PRE1:
+    if version == VERSION_2:
+        obj = {"jsonrpc": "2.0", "id": id}
+        if result:
+            obj["result"] = result
+        else:
+            obj["error"] = error
+    elif version == VERSION_PRE1:
         if result:
             obj = result
         else:

=== modified file 'txjsonrpc/test/test_jsonrpclib.py'
--- txjsonrpc/test/test_jsonrpclib.py	2012-01-28 01:11:15 +0000
+++ txjsonrpc/test/test_jsonrpclib.py	2013-07-30 14:14:25 +0000
@@ -52,14 +52,14 @@
         result = dumps(object, version=VERSION_2)
         self.assertEquals(
             result,
-            '{"id": null, "result": {"some": "data"}, "error": null}')
+            '{"jsonrpc": "2.0", "id": null, "result": {"some": "data"}}')
 
     def test_errorVersion2(self):
         object = Fault("code", "message")
         result = dumps(object, version=VERSION_2)
         self.assertEquals(
             result,
-            ('{"id": null, "result": null, "error": {"fault": "Fault", '
+            ('{"jsonrpc": "2.0", "id": null, "error": {"fault": "Fault", '
              '"faultCode": "code", "faultString": "message"}}'))