From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 6 Apr 2010 17:39:11 +0000 (+0000)
Subject: resolve circular import
X-Git-Tag: sfa-0.9-11~19
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=5ab00a9ce13ad0f8116842e855815a691515d32b

resolve circular import
---

diff --git a/sfa/util/api.py b/sfa/util/api.py
index ca2557f4..099f079d 100644
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -19,8 +19,6 @@ from sfa.trust.credential import *
 from sfa.trust.certificate import *
 from sfa.util.namespace import *
 from sfa.util.sfalogging import *
-from sfa.server.registry import Registries
-from sfa.server.aggregate import Aggregates
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -129,9 +127,11 @@ class BaseAPI:
         self.logger=get_sfa_logger()
         
         # load registries
+        from sfa.server.registry import Registries
         self.registries = Registries(self) 
 
         # load aggregates
+        from sfa.server.aggregate import Aggregates
         self.aggregates = Aggregates(self)