From 5b738204907d82cc9c3f054ad94199c7fe21030f Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 2 Jul 2009 09:15:13 +0000
Subject: [PATCH] imports from geni itself should now be fully qualified

---
 geni/plc.py             | 1 +
 geni/util/geniclient.py | 8 ++++----
 geni/util/genitable.py  | 5 +++--
 geni/util/misc.py       | 2 +-
 geni/util/util.py       | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/geni/plc.py b/geni/plc.py
index 0fc1eb51..46e87805 100644
--- 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.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 fec2d50b..037c8e31 100644
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -11,10 +11,10 @@
 
 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
diff --git a/geni/util/genitable.py b/geni/util/genitable.py
index 13ce7d94..44f238f7 100644
--- a/geni/util/genitable.py
+++ b/geni/util/genitable.py
@@ -10,8 +10,9 @@
 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$"
diff --git a/geni/util/misc.py b/geni/util/misc.py
index 1e6f6bbf..41f50701 100644
--- a/geni/util/misc.py
+++ b/geni/util/misc.py
@@ -1,7 +1,7 @@
 ### $Id$
 ### $URL$
 
-from faults import *
+from geni.util.faults import *
 
 def get_leaf(hrn):
     parts = hrn.split(".")
diff --git a/geni/util/util.py b/geni/util/util.py
index f6f1f229..42cdcbbb 100644
--- a/geni/util/util.py
+++ b/geni/util/util.py
@@ -1,7 +1,7 @@
 ### $Id$
 ### $URL$
 
-from faults import *
+from geni.util.faults import *
 
 SR_SUFFIX = '_srr'
 CR_SUFFIX = '_crr'
-- 
2.47.0