Changeset 1503

Timestamp:

12/09/06 18:02:49

Author:

fumanchu

Message:

2.x fix for #533. CP3 will behave correctly and return a Fault when an XML-RPC method is not found.

Files:

• branches/cherrypy-2.x/cherrypy/filters/xmlrpcfilter.py (modified) (1 diff)
• branches/cherrypy-2.x/cherrypy/test/test_xmlrpc_filter.py (modified) (1 diff)

branches/cherrypy-2.x/cherrypy/filters/xmlrpcfilter.py

@@ -176 +176 @@
-                # Try again with the new path
-                path = x.path
+            except cherrypy.NotFound:
+                # http://www.cherrypy.org/ticket/533
+                # if a method is not found, an xmlrpclib.Fault should be returned
+                # raising an exception here will do that; see
+                # cherrypy.lib.xmlrpc.on_error
+                raise Exception('method "%s" is not supported'
+                                % cherrypy.request.rpcMethod)
-        
-        # See xmlrpclib documentation

branches/cherrypy-2.x/cherrypy/test/test_xmlrpc_filter.py

@@ -97 +97 @@
-        else:
-            self.fail("Expected xmlrpclib.Fault")
+        
+        # http://www.cherrypy.org/ticket/533
+        # if a method is not found, an xmlrpclib.Fault should be raised
+        try:
+            proxy.non_method()
+        except Exception, x:
+            self.assertEqual(x.__class__, xmlrpclib.Fault)
+            self.assertEqual(x.faultString, 'method "non_method" is not supported')
+        else:
+            self.fail("Expected xmlrpclib.Fault")
-
-