Ticket #669: SSLServer.py.patch

SSLServer.py

@@ -25 +25 @@
 class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
     logger = logging.getLogger("Cobalt.Server.XMLRPCDispatcher")
     def __init__ (self, allow_none, encoding):
-        SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self,
-                                                           allow_none,
-                                                           encoding)
+        try:
+            SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self,
+                                                               allow_none,
+                                                               encoding)
+        except TypeError:
+            # Python 2.4?
+            SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+
         self.allow_none = allow_none
         self.encoding = encoding
 
@@ -236 +241 @@
         encoding -- encoding to use for xml-rpc (default UTF-8)
         """
         
-        try:
-            XMLRPCDispatcher.__init__(self, allow_none, encoding)
-        except:
-            XMLRPCDispatcher.__init__(self)
+        XMLRPCDispatcher.__init__(self, allow_none, encoding)
         
         if not RequestHandlerClass:
             class RequestHandlerClass (XMLRPCRequestHandler):