diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-10-06 21:06:16 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-10-06 21:06:16 +0000 |
| commit | 7beb2f08d8dab26d9fe34235c91c1b2a7a2794bd (patch) | |
| tree | 92510fa0a9bb4de4c589b8a2f406aa097e0ab3d2 /src/lib/Server/Component.py | |
| parent | 53a983ba616d1c2292e1f4117084f85a1db9454f (diff) | |
| download | bcfg2-7beb2f08d8dab26d9fe34235c91c1b2a7a2794bd.tar.gz bcfg2-7beb2f08d8dab26d9fe34235c91c1b2a7a2794bd.tar.bz2 bcfg2-7beb2f08d8dab26d9fe34235c91c1b2a7a2794bd.zip | |
Merge of the client/refactor branch (revisions r2218-r2400)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2401 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Component.py')
| -rw-r--r-- | src/lib/Server/Component.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Server/Component.py b/src/lib/Server/Component.py index f57dd7ccc..f3bd47d34 100644 --- a/src/lib/Server/Component.py +++ b/src/lib/Server/Component.py @@ -137,7 +137,10 @@ class Component(SSLServer, except: self.logger.error("Failed to load ssl key %s" % (keyfile), exc_info=1) raise ComponentInitError - SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) + try: + SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) + except TypeError: + SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, False, None) self.logRequests = 0 self.port = self.socket.getsockname()[1] self.url = "https://%s:%s" % (socket.gethostname(), self.port) |