renaming the toplevel geni/ package into sfa/

[sfa.git] / sfa / util / api.py

diff --git a/geni/util/api.py b/sfa/util/api.py
similarity index 97%
rename from geni/util/api.py
rename to sfa/util/api.py
index 3acfbf9..b254ee8 100644 (file)
--- a/geni/util/api.py
+++ b/sfa/util/api.py
@@ -11,13 +11,13 @@ import traceback
 import string
 import xmlrpclib
 
-from geni.util.auth import Auth
-from geni.util.config import *
-from geni.util.faults import *
-from geni.util.debug import *
-from geni.trust.rights import *
-from geni.trust.credential import *
-from geni.util.misc import *
+from sfa.util.auth import Auth
+from sfa.util.config import *
+from sfa.util.faults import *
+from sfa.util.debug import *
+from sfa.trust.rights import *
+from sfa.trust.credential import *
+from sfa.util.misc import *
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -97,8 +97,8 @@ def import_deep(name):
 class GeniAPI:
 
     # flat list of method names
-    import geni.methods
-    methods = geni.methods.all
+    import sfa.methods
+    methods = sfa.methods.all
     
     def __init__(self, config = "/etc/sfa/sfa_config", encoding = "utf-8", 
                  peer_cert = None, interface = None, key_file = None, cert_file = None):
@@ -174,7 +174,7 @@ class GeniAPI:
             credential = Credential(filename = cred_filename)
             return credential
         except IOError:
-            from geni.server.registry import Registries
+            from sfa.server.registry import Registries
             registries = Registries(self)
             registry = registries[self.hrn]
             self_cred = registry.get_credential(None, type, self.hrn)
@@ -475,7 +475,7 @@ class GeniAPI:
         # Get new instance of method
         try:
             classname = method.split(".")[-1]
-            module = __import__("geni.methods." + method, globals(), locals(), [classname])
+            module = __import__("sfa.methods." + method, globals(), locals(), [classname])
             callablemethod = getattr(module, classname)(self)
             return getattr(module, classname)(self)
         except ImportError, AttributeError: