Small fix for CGI-handling of XMLRPC requests for python2.4, this worked

only for 2.5 and beyond due to a change in the xmlrpc interface in
python

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4360 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index 7d0dfbe61b9abfe7ce3570161886b5f7820dff6d..81f08fb5aa4e71ac19f117110c4ba9e9c8120440 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,9 @@ Fixes:
   We now issue a warning during export if the limit is too small and use
   the csv_field_size configuration during import to set the limit for
   the csv module.
+- Small fix for CGI-handling of XMLRPC requests for python2.4, this
+  worked only for 2.5 and beyond due to a change in the xmlrpc interface
+  in python
 
 2009-08-10 1.4.9 (r4346)
 

diff --git a/roundup/xmlrpc.py b/roundup/xmlrpc.py
index 4e0d19ad38be7f42ef49c0e405aa8d1a48fe6e64..86c8f992b207e443bacbd101311b16c3b209bae2 100644 (file)
--- a/roundup/xmlrpc.py
+++ b/roundup/xmlrpc.py
@@ -165,7 +165,12 @@ class RoundupDispatcher(SimpleXMLRPCDispatcher):
     def __init__(self, db, actions, translator,
                  allow_none=False, encoding=None):
 
-        SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
+        try:
+            # python2.5 and beyond
+            SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
+        except TypeError:
+            # python2.4
+            SimpleXMLRPCDispatcher.__init__(self)
         self.register_instance(RoundupInstance(db, actions, translator))