From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 7 Jul 2009 20:23:14 +0000 (+0000)
Subject: Make sure people using xmlrpc don't need to install soap libraries
X-Git-Tag: sfa-0.9-0@14641~125
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ed6976bf5ba4e405fd3aab67014ca2321c9ac8b3;p=sfa.git

Make sure people using xmlrpc don't need to install soap libraries
---

diff --git a/sfa/util/newgeniclient.py b/sfa/util/newgeniclient.py
index 7e41155a..b05947e8 100644
--- a/sfa/util/newgeniclient.py
+++ b/sfa/util/newgeniclient.py
@@ -6,8 +6,6 @@
 ##
 
 
-import xmlrpcprotocol
-import soapprotocol
 
 from sfa.trust.gid import *
 from sfa.trust.credential import *
@@ -40,8 +38,10 @@ class GeniClient:
        self.cert_file = cert_file
 
        if (protocol=="xmlrpc"):
+           import xmlrpcprotocol  
            self.server = xmlrpcprotocol.get_server(self.url, self.key_file, self.cert_file)
        elif (protocol=="soap"):
+           import soapprotocol
            self.server = soapprotocol.get_server(self.url, self.key_file, self.cert_file)
        else:
            raise Exception("Attempted use of undefined protocol %s"%protocol)