func/minion func/overlord

[Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>]

 func/minion/AuthedXMLRPCServer.py |    2 +-
 func/overlord/sslclient.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed959d305c7fcace310828bcac0a475797c45616
Author: S.Ã?aÄ?lar Onur <caglar@xxxxxxxxxxxxxxxx>
Date:   Mon Jul 26 12:54:08 2010 -0400

    Add allow_none parameter to support passing None type over XMLRPC

diff --git a/func/minion/AuthedXMLRPCServer.py b/func/minion/AuthedXMLRPCServer.py
index 621f618..53f7992 100644
--- a/func/minion/AuthedXMLRPCServer.py
+++ b/func/minion/AuthedXMLRPCServer.py
@@ -70,7 +70,7 @@ 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)
+        SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, allow_none=True)
         SSLCommon.BaseSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, pkey, cert, ca_cert, timeout=timeout)
 
 
diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
index ab90196..16bd40f 100644
--- a/func/overlord/sslclient.py
+++ b/func/overlord/sslclient.py
@@ -29,7 +29,7 @@ class SSL_Transport(xmlrpclib.Transport):
 class SSLXMLRPCServerProxy(xmlrpclib.ServerProxy):
     def __init__(self, uri, pkey_file, cert_file, ca_cert_file, timeout=None):
         self.ctx = SSLCommon.CreateSSLContext(pkey_file, cert_file, ca_cert_file)
-        xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx, timeout=timeout))
+        xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx, timeout=timeout), allow_none=True)
 
 
 class FuncServer(SSLXMLRPCServerProxy):


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