typo

[sfa.git] / sfa / util / geniserver.py

diff --git a/sfa/util/geniserver.py b/sfa/util/geniserver.py
index 7159df5..57d97eb 100644 (file)
--- a/sfa/util/geniserver.py
+++ b/sfa/util/geniserver.py
@@ -97,7 +97,11 @@ class SecureXMLRPCServer(BaseHTTPServer.HTTPServer,SimpleXMLRPCServer.SimpleXMLR
         self.interface = None
         self.key_file = key_file
         self.cert_file = cert_file
-        SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, True, None)
+       #for compatibility with python 2.4 (centos53)
+       if sys.version_info < (2, 5):
+          SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+       else:
+           SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, True, None)
         SocketServer.BaseServer.__init__(self, server_address, HandlerClass)
         ctx = SSL.Context(SSL.SSLv23_METHOD)
         ctx.use_privatekey_file(key_file)
@@ -141,8 +145,11 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
 
         It was copied out from SimpleXMLRPCServer.py and modified to shutdown the socket cleanly.
         """
-        self.api = GeniAPI(peer_cert = self.server.peer_cert, interface = self.server.interface, key_file = self.server.key_file, cert_file = self.server.cert_file)
         try:
+            self.api = GeniAPI(peer_cert = self.server.peer_cert, 
+                           interface = self.server.interface, 
+                           key_file = self.server.key_file, 
+                           cert_file = self.server.cert_file)
             # get arguments
             request = self.rfile.read(int(self.headers["content-length"]))
             # In previous versions of SimpleXMLRPCServer, _dispatch