summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-11-03 21:46:37 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-11-03 21:46:37 +0000
commit329b47ee25e9db3828df63110aec5c3b76b7a52b (patch)
tree6ee1b2b414ba0ddaeb45c0f038dd6615a74fd1dc /src
parent2c11cbe63aae13b573ddbfef2d8e80c72766e45d (diff)
downloadbcfg2-329b47ee25e9db3828df63110aec5c3b76b7a52b.tar.gz
bcfg2-329b47ee25e9db3828df63110aec5c3b76b7a52b.tar.bz2
bcfg2-329b47ee25e9db3828df63110aec5c3b76b7a52b.zip
remove client m2crypto requirement
(Logical change 1.350) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1452 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/XMLRPCComm.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Client/XMLRPCComm.py b/src/lib/Client/XMLRPCComm.py
index 41119c192..72e494396 100644
--- a/src/lib/Client/XMLRPCComm.py
+++ b/src/lib/Client/XMLRPCComm.py
@@ -3,8 +3,7 @@ __revision__ = '$Revision:$'
from elementtree.ElementTree import XML
from ConfigParser import ConfigParser
-from M2Crypto.m2xmlrpclib import ServerProxy, SSL_Transport
-from xmlrpclib import Fault
+from xmlrpclib import Fault, ServerProxy
from sys import exc_info
from traceback import extract_tb
@@ -19,7 +18,7 @@ class comm_lib(object):
self.cf = ConfigParser()
self.cf.read('/etc/bcfg2.conf')
location = self.cf.get("components", "bcfg2")
- self.proxy = ServerProxy(location, SSL_Transport())
+ self.proxy = ServerProxy(location)
self.user = 'root'
self.password = self.cf.get("communication", "password")