Hi Seth,
That commit causes following exception;
2010-08-27 16:48:11,806 - INFO - Exception occured: <type
'exceptions.TypeError'>
2010-08-27 16:48:11,806 - INFO - Exception value: __init__() takes exactly 3
arguments (1 given)
2010-08-27 16:48:11,806 - INFO - Exception Info:
File "/usr/bin/funcd", line 23, in <module>
server.main(sys.argv)
File "/usr/lib/python2.5/site-packages/func/minion/server.py", line 379, in
main
serve()
File "/usr/lib/python2.5/site-packages/func/minion/server.py", line 218, in
serve
server =FuncSSLXMLRPCServer((listen_addr, listen_port))
File "/usr/lib/python2.5/site-packages/func/minion/server.py", line 271, in
__init__
self.ca)
File "/usr/lib/python2.5/site-packages/func/minion/AuthedXMLRPCServer.py",
line 73, in __init__
if hasattr(SimpleXMLRPCServer.SimpleXMLRPCDispatcher(), 'allow_none'):
what about something like following?
[cag...@zanpaktou:~/Downloads/github/f...@devel] git diff
diff --git a/func/minion/AuthedXMLRPCServer.py
b/func/minion/AuthedXMLRPCServer.py
index 3093e31..691911b 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)
- if hasattr(SimpleXMLRPCServer.SimpleXMLRPCDispatcher(), 'allow_none'):
+ if sys.version_info[0] >= 2 and sys.version_info[1] >= 4:
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address,
AuthedSimpleXMLRPCRequestHandler, allow_none=True)
else:
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, address,
AuthedSimpleXMLRPCRequestHandler)
On Aug 26, 2010, at 1:07 PM, Seth Vidal wrote:
> func/minion/AuthedXMLRPCServer.py | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> New commits:
> commit ee1ed8b1ff746bd0e4a2a4392a2bf842c701eabb
> Author: Seth Vidal <[email protected]>
> 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
> [email protected]
> https://www.redhat.com/mailman/listinfo/func-list
--
S.Çağlar Onur <[email protected]>
_______________________________________________
Func-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/func-list
