Changeset 1955

Timestamp:

04/26/08 20:19:53

Author:

fumanchu

Message:

Test and fix for #791 (cherrypy.lib.xmlrpc.respond cannot marshal xmlrpclib.Fault objects).

Files:

• trunk/cherrypy/lib/xmlrpc.py (modified) (1 diff)
• trunk/cherrypy/test/test_xmlrpc.py (modified) (3 diffs)

trunk/cherrypy/lib/xmlrpc.py

@@ -37 +37 @@
-def respond(body, encoding='utf-8', allow_none=0):
-    import xmlrpclib
-
+
+
+
-                                  encoding=encoding,
-                                  allow_none=allow_none))

trunk/cherrypy/test/test_xmlrpc.py

@@ -60 +60 @@
-            return num * 2
-        test_argument_passing.exposed = True
+
+        def test_returning_Fault(self):
+            return xmlrpclib.Fault(1, "custom Fault response")
+        test_returning_Fault.exposed = True
-
-    root = Root()
@@ -154 +158 @@
-        else:
-            self.fail("Expected xmlrpclib.Fault")
-
+
-        # http://www.cherrypy.org/ticket/533
-        # if a method is not found, an xmlrpclib.Fault should be raised
@@ -164 +168 @@
-        else:
-            self.fail("Expected xmlrpclib.Fault")
+        
+        # Test returning a Fault from the page handler.
+        try:
+            proxy.test_returning_Fault()
+        except Exception, x:
+            self.assertEqual(x.__class__, xmlrpclib.Fault)
+            self.assertEqual(x.faultString, ("custom Fault response"))
+        else:
+            self.fail("Expected xmlrpclib.Fault")
-
-