Changeset 729

Timestamp:

10/08/05 16:33:46

Author:

dowski

Message:

1. Fix for #339
2. Test for xmlrpcfilter (not integrated into test.py yet)

Files:

• trunk/cherrypy/lib/filter/xmlrpcfilter.py (modified) (2 diffs)
• trunk/cherrypy/test/test_xmlrpc_filter.py (added)

trunk/cherrypy/lib/filter/xmlrpcfilter.py

@@ -180 +180 @@
-        # used for debugging and more info
-        # print "XMLRPC Filter: calling '%s' with args: '%s' " % (cherrypy.request.path,params)
+
+    def beforeMain(self):
+        """This is a variation of main() from _cphttptools.
+
+        The reason it is redone here is because we don't want
+        cherrypy.response.body = iterable(body) - we want to use
+        whatever real value the user returned from their callable
+        to reach the xmlrpcfilter unchanged."""
+        
+        if not cherrypy.request.xmlRpcFilterOn:
+            return
+        
+        from cherrypy._cphttptools import mapPathToObject
+        path = cherrypy.request.objectPath or cherrypy.request.path
+        
+        while True:
+            try:
+                page_handler, object_path, virtual_path = mapPathToObject(path)
+                
+                # Remove "root" from object_path and join it to get objectPath
+                cherrypy.request.objectPath = '/' + '/'.join(object_path[1:])
+                args = virtual_path + cherrypy.request.paramList
+                body = page_handler(*args, **cherrypy.request.paramMap)
+                cherrypy.response.body = body
+                return
+            except cherrypy.InternalRedirect, x:
+                # Try again with the new path
+                path = x.path        
-    
-    def beforeFinalize(self):
@@ -188 +216 @@
-
-        encoding = cherrypy.config.get('xmlRpcFilter.encoding', 'utf-8')
-
-        if not isinstance(cherrypy.response.body, list):
-            cherrypy.response.body = [cherrypy.response.body]
-        
-        cherrypy.response.body = [xmlrpclib.dumps(
-[0]
+
-            methodresponse=1,
-            encoding=encoding,
-            allow_none=1)]
-        cherrypy.response.headerMap['Content-Type'] = 'text/xml'
-[0]
+
-    
-    def beforeErrorResponse(self):