func/minion/AuthedXMLRPCServer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit e001486cfa4debc2cca8666f00be770397f95200 Author: Seth Vidal <[email protected]> Date: Fri Sep 3 13:28:09 2010 -0400 different fix for the simplexmlrpcserver differences in versions of python. This is partially from S.ÃaÄlar Onur and then i changed it around to make sure it didn't fall afoul of python 3.2, for example tested on rhel5 and rhel6. diff --git a/func/minion/AuthedXMLRPCServer.py b/func/minion/AuthedXMLRPCServer.py index 3093e31..7e0cc62 100644 --- a/func/minion/AuthedXMLRPCServer.py +++ b/func/minion/AuthedXMLRPCServer.py @@ -70,10 +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) - if hasattr(SimpleXMLRPCServer.SimpleXMLRPCDispatcher(), 'allow_none'): - SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, allow_none=True) - else: + if sys.version_info[0] <= 2 and sys.version_info[1] <= 4: SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) + else: + SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, allow_none=True) SSLCommon.BaseSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, pkey, cert, ca_cert, timeout=timeout)
_______________________________________________ Func-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/func-list
