[Checkins] SVN: z3c.jsonrpc/trunk/ - for jsonrpc version 1.1 :

[Juergen Kartnaller]

Log message for revision 96765:
  - for jsonrpc version 1.1 :
     - must not provide "error" property in case of success
     - must not provide "result" property in case of error
  

Changed:
  U   z3c.jsonrpc/trunk/CHANGES.txt
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/publisher.py

-=-
Modified: z3c.jsonrpc/trunk/CHANGES.txt
===================================================================
--- z3c.jsonrpc/trunk/CHANGES.txt	2009-02-19 15:42:07 UTC (rev 96764)
+++ z3c.jsonrpc/trunk/CHANGES.txt	2009-02-19 15:54:53 UTC (rev 96765)
@@ -5,6 +5,10 @@
 Version 0.5.2dev (unreleased)
 -----------------------------
 
+- for jsonrpc version 1.1 :
+   - must not provide "error" property in case of success
+   - must not provide "result" property in case of error
+
 - removed develop path for z3c.json from buildout.cfg
 - publisher checks for version id as a string not a float
 

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/publisher.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/publisher.py	2009-02-19 15:42:07 UTC (rev 96764)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/publisher.py	2009-02-19 15:54:53 UTC (rev 96765)
@@ -313,8 +313,7 @@
         if jsonVersion == "1.0":
             wrapper = {'result': result, 'error': None, 'id': jsonId}
         elif jsonVersion == "1.1":
-            wrapper = {'version': jsonVersion, 'result': result, 'error': None,
-                       'id': jsonId}
+            wrapper = {'version': jsonVersion, 'result': result, 'id': jsonId}
         else:
             wrapper = {'jsonrpc': jsonVersion, 'result': result, 'id': jsonId}
         json = zope.component.getUtility(IJSONWriter)
@@ -359,7 +358,6 @@
                        'id': self._request.jsonId,}
         elif self._request.jsonVersion == "1.1":
             wrapper = {'version': self._request.jsonVersion,
-                       'result': None,
                        'error': s,
                        'id': self._request.jsonId,}
         else: