summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-11-21 16:37:27 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-11-21 16:37:27 +0000
commit3420c77e24e815411d679ed2e8819bcde5725f14 (patch)
treeab59171cf275b73ce1cf597ae07bf90f3b960b2c /src
parenta758ff1d78c9dac28a7107cb43c4e563e7abc2b2 (diff)
downloadbcfg2-3420c77e24e815411d679ed2e8819bcde5725f14.tar.gz
bcfg2-3420c77e24e815411d679ed2e8819bcde5725f14.tar.bz2
bcfg2-3420c77e24e815411d679ed2e8819bcde5725f14.zip
stupid python-specific debian package naming bug
(Logical change 1.361) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1505 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Component.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Server/Component.py b/src/lib/Server/Component.py
index 54af40db8..d94091a84 100644
--- a/src/lib/Server/Component.py
+++ b/src/lib/Server/Component.py
@@ -4,7 +4,7 @@ __revision__ = '$Revision: 1.4 $'
from ConfigParser import ConfigParser, NoOptionError
from cPickle import loads, dumps
from M2Crypto import SSL
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler, SimpleXMLRPCDispatcher
+from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
from select import select
from socket import gethostname
from sys import exc_info
@@ -14,6 +14,11 @@ from traceback import extract_tb
from xmlrpclib import dumps, loads, Fault
from urlparse import urlparse
+try:
+ from SimpleXMLRPCServer import SimpleXMLRPCDispatcher
+except ImportError:
+ SimpleXMLRPCDispatcher = object
+
class CobaltXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
'''CobaltXMLRPCRequestHandler takes care of ssl xmlrpc requests'''
def finish(self):