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 7e41155..b05947e 100644 (file)
--- 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)