Changeset 1663

Timestamp:

06/14/07 13:34:20

Author:

fumanchu

Message:

Allow non-xmlrpc methods on an XMLRPCController.

Files:

• trunk/cherrypy/_cptools.py (modified) (2 diffs)
• trunk/cherrypy/test/test_xmlrpc.py (modified) (3 diffs)

trunk/cherrypy/_cptools.py

@@ -278 +278 @@
-    _cp_config = {'tools.xmlrpc.on': True}
-    
-__call__
+default
-        rpcparams, rpcmethod = _xmlrpc.process_body()
-        
@@ -300 +300 @@
-                        conf.get('allow_none', 0))
-        return cherrypy.response.body
-
-
-
+
-
-

trunk/cherrypy/test/test_xmlrpc.py

@@ -16 +16 @@
-
-    class XmlRpc(_cptools.XMLRPCController):
+        
+        def foo(self):
+            return "Hello world!"
+        foo.exposed = True
-        
-        def return_single_item_list(self):
@@ -94 +98 @@
-        
-        # load the appropriate xmlrpc proxy
-
+
+
+
+
+
+
+
-            url = 'https://%s:%s/xmlrpc/' % (self.HOST, self.PORT)
-            proxy = xmlrpclib.ServerProxy(url, transport=HTTPSTransport())
@@ -102 +112 @@
-        
-        # begin the tests ...
+        self.getPage("/xmlrpc/foo")
+        self.assertBody("Hello world!")
+        
-        self.assertEqual(proxy.return_single_item_list(), [42])
-        self.assertNotEqual(proxy.return_single_item_list(), 'one bazillion')