Changeset 97

Timestamp:

12/29/04 14:03:24

Author:

rboerma

Message:

patched xmlrpcfilter so debug msgs will not appear, added standard cherrypyteam header, added to changelog

Files:

• trunk/ChangeLog.txt (modified) (1 diff)
• trunk/cherrypy/lib/filter/xmlrpcfilter.py (modified) (6 diffs)

trunk/ChangeLog.txt

@@ -1 +1 @@
-2004/12-29:
-        * CherryPY-2.0-beta released
+    * xmlrpcfilter added (Remco)
-        * cpg.response.body is now always an iterable type - ticket #59 (Carlos)
-        * Allowed default session functions to be accessed by other modules -

trunk/cherrypy/lib/filter/xmlrpcfilter.py

@@ +1 @@
+"""
+Copyright (c) 2004, CherryPy Team (team@cherrypy.org)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the name of the CherryPy Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
-##########################################################################
-## 
-## xmlrpcfilter is as open as it can be. Do whatever you like,
-## but understand that i take no responsibility for the code itself,
-## nor for wat it does and especially any derivatives and when you use
-## it, keep a copyright somewhere of me, or make notice of CherryPy
-##
-## Remco Boerma
-##
-## History:
+## 1.0.0   : 2004-12-29 Released with CP2
-## 0.0.9   : 2004-12-23 made it CP2 #59 compatible (returns an iterable)
-##           Please note: as the xmlrpc doesn't know what you would want to return
@@ -53 +60 @@
-## EXAMPLE CODE FOR THE SERVER:
-##    from cherrypy import cpg
-
+cherrypy.lib.xmlrpcfilter as 
-##    class Root:
-mimeTypeList = ['text/xml']
+
-##
-##        def test(self):
@@ -83 +90 @@
-    PLEASE NOTE:
-
-
-    --  IN CASE TICKET #28 IS NOT RESOLVED
-        ANY XMLRPC FUNCTION NEEDS TO RETURN A PYTHON SOURCE STRING
-            use
-              return `result`
-            insted of
-              return result
-            . 
-
-    --  AS ALL REQUESTS MUST RETURN A STRING (UNTIL THE FIX IS THERE)
-        ALL METHODS ARE CALLABLE USING A REGULAR WEBBROWSER AS WELL!!
-
-    afterRequestHeader:
-        Unmarshalls the posted data to a methodname and parameters.
@@ -117 +112 @@
-    def afterRequestHeader(self):
-        """ Called after the request header has been read/parsed"""
-##        try:
-##            x = cpg.request.isRPC # should fail!
-##            print "error: afterRequestHeader is called twice!"
-##            return 
-##        except:
-##            pass
-        cpg.request.isRPC = self.testValidityOfRequest()
-        if not cpg.request.isRPC: 
-
+
+
-            return # break this if it's not for this filter!!
-
+
+
-        cpg.request.parsePostData = 0
-        dataLength = int(cpg.request.headerMap.get('Content-Length',0))
-        # ought to be true:
-        # if cpg.request.method == 'POST':
-        # if not, it's probabely a webbrowser requesting the url
-        data = cpg.request.rfile.read(dataLength)
-        #else:
-        #    data = None
-
-        # for testing: an exception may be raised as well. . an xmlrpc 'Fault' would be better though.
-        try:
-            params, method = xmlrpclib.loads(data)
@@ -153 +137 @@
-        cpg.request.path+=str(method).replace('.','/')
-        cpg.request.paramList = list(params)
-
+
+
-
-    def beforeResponse(self):
@@ -160 +145 @@
-            return # it's not an RPC call, so just let it go with the normal flow
-        try:
-
+
+
-            cpg.response.body = xmlrpclib.dumps((cpg.response.body[0],), methodresponse=1,allow_none=1)
-        except xmlrpclib.Fault,fault: