func/minion

[Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>]

 func/minion/AuthedXMLRPCServer.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ee1ed8b1ff746bd0e4a2a4392a2bf842c701eabb
Author: Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>
Date:   Thu Aug 26 13:06:42 2010 -0400

    python 2.4's XMLRPCServer doesn't have 'allow_none' which makes things break here.
    
    This means older python's won't quite be the same but it lets it work and lets us walk it forward :(

diff --git a/func/minion/AuthedXMLRPCServer.py b/func/minion/AuthedXMLRPCServer.py
index 53f7992..3093e31 100644
--- a/func/minion/AuthedXMLRPCServer.py
+++ b/func/minion/AuthedXMLRPCServer.py
@@ -70,7 +70,10 @@ class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.BaseSSLServer, Sim
 
     def __init__(self, address, pkey, cert, ca_cert, authinfo_callback=None, timeout=None):
         BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback)
-        SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, allow_none=True)
+        if hasattr(SimpleXMLRPCServer.SimpleXMLRPCDispatcher(), 'allow_none'):
+            SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, allow_none=True)
+        else:
+            SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler)
         SSLCommon.BaseSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, pkey, cert, ca_cert, timeout=timeout)
 
 


_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list