imports from geni itself should now be fully qualified

diff --git a/geni/plc.py b/geni/plc.py
index 0fc1eb5..46e8780 100644 (file)
--- a/geni/plc.py
+++ b/geni/plc.py
@@ -41,6 +41,7 @@ from geni.util.hierarchy import Hierarchy
 from geni.util.trustedroot import TrustedRootList
 from geni.util.certificate import Keypair, Certificate
 from geni.util.config import Config
 from geni.util.trustedroot import TrustedRootList
 from geni.util.certificate import Keypair, Certificate
 from geni.util.config import Config

+

 from geni.registry import Registry
 from geni.aggregate import Aggregate
 from geni.slicemgr import SliceMgr
 from geni.registry import Registry
 from geni.aggregate import Aggregate
 from geni.slicemgr import SliceMgr

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index fec2d50..037c8e3 100644 (file)
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -11,10 +11,10 @@
 
 import xmlrpclib
 
 
 import xmlrpclib
 

-from gid import *
-from credential import *
-from record import *
-from geniticket import *
+from geni.util.gid import *
+from geni.util.credential import *
+from geni.util.record import *
+from geni.util.geniticket import *

 
 ##
 # ServerException, ExceptionUnmarshaller
 
 ##
 # ServerException, ExceptionUnmarshaller

diff --git a/geni/util/genitable.py b/geni/util/genitable.py
index 13ce7d9..44f238f 100644 (file)
--- a/geni/util/genitable.py
+++ b/geni/util/genitable.py
@@ -10,8 +10,9 @@
 import report
 
 from pg import DB, ProgrammingError
 import report
 
 from pg import DB, ProgrammingError

-from gid import *
-from record import *
+
+from geni.util.gid import *
+from geni.util.record import *

 from geni.util.debug import *
 
 GENI_TABLE_PREFIX = "geni$"
 from geni.util.debug import *
 
 GENI_TABLE_PREFIX = "geni$"

diff --git a/geni/util/misc.py b/geni/util/misc.py
index 1e6f6bb..41f5070 100644 (file)
--- a/geni/util/misc.py
+++ b/geni/util/misc.py
@@ -1,7 +1,7 @@
 ### $Id$
 ### $URL$
 
 ### $Id$
 ### $URL$
 

-from faults import *
+from geni.util.faults import *

 
 def get_leaf(hrn):
     parts = hrn.split(".")
 
 def get_leaf(hrn):
     parts = hrn.split(".")

diff --git a/geni/util/util.py b/geni/util/util.py
index f6f1f22..42cdcbb 100644 (file)
--- a/geni/util/util.py
+++ b/geni/util/util.py
@@ -1,7 +1,7 @@
 ### $Id$
 ### $URL$
 
 ### $Id$
 ### $URL$
 

-from faults import *
+from geni.util.faults import *

 
 SR_SUFFIX = '_srr'
 CR_SUFFIX = '_crr'
 
 SR_SUFFIX = '_srr'
 CR_SUFFIX = '_crr'