summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-29 01:09:53 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-29 01:09:53 +0000
commit1dcfea59be46c5179bcbab235786abe52511ec2d (patch)
tree38e203ec006654d9b62246683366f6c5276ac854
parentbf524622abb103862d14350375e3efc963487fda (diff)
downloadbcfg2-1dcfea59be46c5179bcbab235786abe52511ec2d.tar.gz
bcfg2-1dcfea59be46c5179bcbab235786abe52511ec2d.tar.bz2
bcfg2-1dcfea59be46c5179bcbab235786abe52511ec2d.zip
Fall back to previous XMLRPCDispatcher calling convention (Resolves Ticket #669)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5260 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/SSLServer.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index 850fb28d7..d24487005 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -236,7 +236,10 @@ class XMLRPCServer (SocketServer.ThreadingMixIn, SSLServer,
encoding -- encoding to use for xml-rpc (default UTF-8)
"""
- XMLRPCDispatcher.__init__(self, allow_none, encoding)
+ try:
+ XMLRPCDispatcher.__init__(self, allow_none, encoding)
+ except:
+ XMLRPCDispatcher.__init__(self)
if not RequestHandlerClass:
class RequestHandlerClass (XMLRPCRequestHandler):